[PATCH] D73512: [runtimes] Fix passing lists to runtimes configures
Shoaib Meenai via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Jan 28 14:44:06 PST 2020
This revision was automatically updated to reflect the committed changes.
Closed by commit rG2e745ba6b0ba: [runtimes] Fix passing lists to runtimes configures (authored by smeenai).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D73512/new/
https://reviews.llvm.org/D73512
Files:
llvm/runtimes/CMakeLists.txt
Index: llvm/runtimes/CMakeLists.txt
===================================================================
--- llvm/runtimes/CMakeLists.txt
+++ llvm/runtimes/CMakeLists.txt
@@ -266,7 +266,8 @@
string(FIND "${variableName}" "BUILTINS_${target}" out)
if("${out}" EQUAL 0)
string(REPLACE "BUILTINS_${target}_" "" new_name ${variableName})
- list(APPEND ${target}_extra_args "-D${new_name}=${${variableName}}")
+ string(REPLACE ";" "|" new_value "${${variableName}}")
+ list(APPEND ${target}_extra_args "-D${new_name}=${new_value}")
endif()
endforeach()
@@ -452,22 +453,19 @@
string(FIND "${variableName}" "RUNTIMES_${target}_" out)
if("${out}" EQUAL 0)
string(REPLACE "RUNTIMES_${target}_" "" new_name ${variableName})
- list(APPEND ${name}_extra_args "-D${new_name}=${${variableName}}")
+ string(REPLACE ";" "|" new_value "${${variableName}}")
+ list(APPEND ${name}_extra_args "-D${new_name}=${new_value}")
endif()
endforeach()
foreach(variableName ${variableNames})
string(FIND "${variableName}" "RUNTIMES_${name}_" out)
if("${out}" EQUAL 0)
string(REPLACE "RUNTIMES_${name}_" "" new_name ${variableName})
- list(APPEND ${name}_extra_args "-D${new_name}=${${variableName}}")
+ string(REPLACE ";" "|" new_value "${${variableName}}")
+ list(APPEND ${name}_extra_args "-D${new_name}=${new_value}")
endif()
endforeach()
- if(NOT RUNTIMES_${name}_LLVM_ENABLE_RUNTIMES)
- string(REPLACE ";" "|" LLVM_ENABLE_RUNTIMES_PASSTHROUGH "${LLVM_ENABLE_RUNTIMES}")
- list(APPEND ${name}_extra_args -DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES_PASSTHROUGH})
- endif()
-
if(target IN_LIST LLVM_RUNTIME_BUILD_ID_LINK_TARGETS)
list(APPEND EXTRA_ARGS STRIP_TOOL ${CMAKE_CURRENT_BINARY_DIR}/llvm-strip-link)
endif()
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D73512.241002.patch
Type: text/x-patch
Size: 1901 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200128/8a6bfbea/attachment.bin>
More information about the llvm-commits
mailing list