summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2017-12-05 00:15:18 +0000
committerPetr Hosek <phosek@chromium.org>2017-12-05 00:15:18 +0000
commitde0aeb800c9dc85ec249e58c56771702a0853e42 (patch)
tree3336cd85ca1ff800ac06c5c73df571f055994c6c /cmake
parentf68b9beeb97bd44cc651d519c45e8ad32067825d (diff)
[CMake] Don't use comma as an alternate separator
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/D40761 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319719 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/LLVMExternalProjectUtils.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/modules/LLVMExternalProjectUtils.cmake b/cmake/modules/LLVMExternalProjectUtils.cmake
index 373387c755c..709c7c2556c 100644
--- a/cmake/modules/LLVMExternalProjectUtils.cmake
+++ b/cmake/modules/LLVMExternalProjectUtils.cmake
@@ -95,7 +95,7 @@ function(llvm_ExternalProject_Add name source_dir)
foreach(prefix ${ARG_PASSTHROUGH_PREFIXES})
foreach(variableName ${variableNames})
if(variableName MATCHES "^${prefix}")
- string(REPLACE ";" "," value "${${variableName}}")
+ string(REPLACE ";" "|" value "${${variableName}}")
list(APPEND PASSTHROUGH_VARIABLES
-D${variableName}=${value})
endif()
@@ -160,7 +160,7 @@ function(llvm_ExternalProject_Add name source_dir)
USES_TERMINAL_CONFIGURE 1
USES_TERMINAL_BUILD 1
USES_TERMINAL_INSTALL 1
- LIST_SEPARATOR ,
+ LIST_SEPARATOR |
)
if(ARG_USE_TOOLCHAIN)