From f5aab5454e1db6acd22df4c1824662b5aedd00e7 Mon Sep 17 00:00:00 2001 From: Don Hinton Date: Tue, 28 Nov 2017 21:23:30 +0000 Subject: [PATCH] [cmake] Pass LLVM_USE_LINKER flag when building host tools, e.g., LLVM_OPTIMIZED_TABLEGEN=ON, and not crosscompiling. Differential Revision: https://reviews.llvm.org/D39734 llvm-svn: 319228 --- llvm/cmake/modules/CrossCompile.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake index 8f9e6132..4cd0197 100644 --- a/llvm/cmake/modules/CrossCompile.cmake +++ b/llvm/cmake/modules/CrossCompile.cmake @@ -15,6 +15,9 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype) if (buildtype) set(build_type_flags "-DCMAKE_BUILD_TYPE=${buildtype}") endif() + if (LLVM_USE_LINKER AND NOT CMAKE_CROSSCOMPILING) + set(linker_flag "-DLLVM_USE_LINKER=${LLVM_USE_LINKER}") + endif() if (LLVM_EXTERNAL_CLANG_SOURCE_DIR) # Propagate LLVM_EXTERNAL_CLANG_SOURCE_DIR so that clang-tblgen can be built set(external_clang_dir "-DLLVM_EXTERNAL_CLANG_SOURCE_DIR=${LLVM_EXTERNAL_CLANG_SOURCE_DIR}") @@ -32,7 +35,7 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype) ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR} -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE -DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD} - ${build_type_flags} ${external_clang_dir} + ${build_type_flags} ${linker_flag} ${external_clang_dir} WORKING_DIRECTORY ${LLVM_${target_name}_BUILD} DEPENDS CREATE_LLVM_${target_name} COMMENT "Configuring ${target_name} LLVM...") -- 2.7.4