[llvm] r357487 - [llvm-shlib] Fix cross-compilation for LLVM-C
Shoaib Meenai via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 2 08:58:05 PDT 2019
Author: smeenai
Date: Tue Apr 2 08:58:05 2019
New Revision: 357487
URL: http://llvm.org/viewvc/llvm-project?rev=357487&view=rev
Log:
[llvm-shlib] Fix cross-compilation for LLVM-C
When we're cross-compiling, build and use a native llvm-nm instead of
attempting to use the one from the target's build tree.
A nice follow-up would be to add a cache variable to allow specifying a
path to an external native llvm-nm instead of building one ourselves,
similar to LLVM_TABLEGEN and LLVM_CONFIG_PATH.
Differential Revision: https://reviews.llvm.org/D60025
Modified:
llvm/trunk/tools/llvm-shlib/CMakeLists.txt
Modified: llvm/trunk/tools/llvm-shlib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-shlib/CMakeLists.txt?rev=357487&r1=357486&r2=357487&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-shlib/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-shlib/CMakeLists.txt Tue Apr 2 08:58:05 2019
@@ -164,9 +164,17 @@ if(MSVC)
set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllvm-c.exports)
+ if(CMAKE_CROSSCOMPILING)
+ build_native_tool(llvm-nm llvm_nm)
+ set(llvm_nm_target "${llvm_nm}")
+ else()
+ set(llvm_nm $<TARGET_FILE:llvm-nm>)
+ set(llvm_nm_target llvm-nm)
+ endif()
+
add_custom_command(OUTPUT ${LLVM_EXPORTED_SYMBOL_FILE}
- COMMAND ${PYTHON_EXECUTABLE} ${GEN_SCRIPT} --libsfile ${LIBSFILE} ${GEN_UNDERSCORE} --nm ${LLVM_TOOLS_BINARY_DIR}/llvm-nm -o ${LLVM_EXPORTED_SYMBOL_FILE}
- DEPENDS ${LIB_NAMES} llvm-nm
+ COMMAND ${PYTHON_EXECUTABLE} ${GEN_SCRIPT} --libsfile ${LIBSFILE} ${GEN_UNDERSCORE} --nm "${llvm_nm}" -o ${LLVM_EXPORTED_SYMBOL_FILE}
+ DEPENDS ${LIB_NAMES} ${llvm_nm_target}
COMMENT "Generating export list for LLVM-C"
VERBATIM )
More information about the llvm-commits
mailing list