[PATCH] D40896: [cmake] Move CMAKE_(C|CXX)_COMPILER variables before CROSS_TOOLCHAIN_FLAGS sothey can be overridden when cross compiling.
Don Hinton via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Dec 6 07:03:36 PST 2017
hintonda created this revision.
Herald added a subscriber: mgorny.
Since CROSS_TOOLCHAN_FLAGS can set CMAKE_(C|CXX)_COMPILER
variables, move the compiler variables up front so they can be
overridden.
This is a followup to https://reviews.llvm.org/D40229 committed in https://reviews.llvm.org/rL319620.
Thanks to Pavel Labath for reporting this issue.
https://reviews.llvm.org/D40896
Files:
cmake/modules/CrossCompile.cmake
Index: cmake/modules/CrossCompile.cmake
===================================================================
--- cmake/modules/CrossCompile.cmake
+++ cmake/modules/CrossCompile.cmake
@@ -32,10 +32,10 @@
add_custom_command(OUTPUT ${LLVM_${target_name}_BUILD}/CMakeCache.txt
COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
- ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR}
- -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR}
+ -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE
-DLLVM_TARGETS_TO_BUILD=Native
${build_type_flags} ${linker_flag} ${external_clang_dir}
WORKING_DIRECTORY ${LLVM_${target_name}_BUILD}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40896.125724.patch
Type: text/x-patch
Size: 825 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171206/ecb89fc9/attachment.bin>
More information about the llvm-commits
mailing list