Skip to content

Commit

Permalink
[CMake] Don't use comma as an alternate separator
Browse files Browse the repository at this point in the history
Using comma can break in cases when we're passing flags that already
use comma as a separator.

Fixes PR35504.

Differential Revision: https://reviews.llvm.org/D40762

llvm-svn: 319720
  • Loading branch information
petrhosek committed Dec 5, 2017
1 parent 6851c0c commit 5a34c34
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions clang/CMakeLists.txt
Expand Up @@ -655,7 +655,7 @@ if (CLANG_ENABLE_BOOTSTRAP)
foreach(variableName ${variableNames})
if(variableName MATCHES "^BOOTSTRAP_")
string(SUBSTRING ${variableName} 10 -1 varName)
string(REPLACE ";" "," value "${${variableName}}")
string(REPLACE ";" "|" value "${${variableName}}")
list(APPEND PASSTHROUGH_VARIABLES
-D${varName}=${value})
endif()
Expand All @@ -671,7 +671,7 @@ if (CLANG_ENABLE_BOOTSTRAP)
if("${${variableName}}" STREQUAL "")
set(value "")
else()
string(REPLACE ";" "," value "${${variableName}}")
string(REPLACE ";" "|" value "${${variableName}}")
endif()
list(APPEND PASSTHROUGH_VARIABLES
-D${variableName}=${value})
Expand Down Expand Up @@ -699,7 +699,7 @@ if (CLANG_ENABLE_BOOTSTRAP)
USES_TERMINAL_CONFIGURE 1
USES_TERMINAL_BUILD 1
USES_TERMINAL_INSTALL 1
LIST_SEPARATOR ,
LIST_SEPARATOR |
)

# exclude really-install from main target
Expand Down

0 comments on commit 5a34c34

Please sign in to comment.