RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

[cmake] Fix bug in r358779 - [CMake] Pass monorepo build settings in cross compile

Browse Source 
Escape semicolons in the targets list so that cmake doesn't expand
them to spaces.

llvm-svn: 358859
This commit is contained in:
Don Hinton 2019-04-21 19:20:13 +00:00
parent 37ae5d8646
commit 5e503b6e37
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/modules/CrossCompile.cmake
View File

@ -45,6 +45,11 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype)
string(REPLACE ";" "$<SEMICOLON>" experimental_targets_to_build_arg
"${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}")
string(REPLACE ";" "$<SEMICOLON>" llvm_enable_projects_arg
"${LLVM_ENABLE_PROJECTS}")
string(REPLACE ";" "$<SEMICOLON>" llvm_external_projects_arg
"${LLVM_EXTERNAL_PROJECTS}")
add_custom_command(OUTPUT ${LLVM_${target_name}_BUILD}/CMakeCache.txt
COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}"
@ -54,8 +59,8 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype)
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${experimental_targets_to_build_arg}"
-DLLVM_DEFAULT_TARGET_TRIPLE="${TARGET_TRIPLE}"
-DLLVM_TARGET_ARCH="${LLVM_TARGET_ARCH}"
-DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS}"
-DLLVM_EXTERNAL_PROJECTS="${LLVM_EXTERNAL_PROJECTS}"
-DLLVM_ENABLE_PROJECTS="${llvm_enable_projects_arg}"
-DLLVM_EXTERNAL_PROJECTS="${llvm_external_projects_arg}"
-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN="${LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN}"
${build_type_flags} ${linker_flag} ${external_clang_dir}
WORKING_DIRECTORY ${LLVM_${target_name}_BUILD}