diff options
| author | Don Hinton <hintonda@gmail.com> | 2019-04-21 19:20:13 +0000 |
|---|---|---|
| committer | Don Hinton <hintonda@gmail.com> | 2019-04-21 19:20:13 +0000 |
| commit | 75a43a28f0b315daf135e0b3c9ea7751c814a5eb (patch) | |
| tree | 88dde93c9ff752f10b68b3614b944e9844f0124f | |
| parent | 18cfd9fdaf0b01e7a9b2cc67fddfeed877c8fc8f (diff) | |
| download | bcm5719-llvm-75a43a28f0b315daf135e0b3c9ea7751c814a5eb.tar.gz bcm5719-llvm-75a43a28f0b315daf135e0b3c9ea7751c814a5eb.zip | |
[cmake] Fix bug in r358779 - [CMake] Pass monorepo build settings in cross compile
Escape semicolons in the targets list so that cmake doesn't expand
them to spaces.
llvm-svn: 358859
| -rw-r--r-- | llvm/cmake/modules/CrossCompile.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake index 6d186de2724..d6b416131fe 100644 --- a/llvm/cmake/modules/CrossCompile.cmake +++ b/llvm/cmake/modules/CrossCompile.cmake @@ -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} |
