[PATCH] D60025: [llvm-shlib] Fix cross-compilation for LLVM-C

[Shoaib Meenai via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL357487: [llvm-shlib] Fix cross-compilation for LLVM-C (authored by smeenai, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D60025?vs=193139&id=193311#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D60025/new/

https://reviews.llvm.org/D60025

Files:
  llvm/trunk/tools/llvm-shlib/CMakeLists.txt


Index: llvm/trunk/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-shlib/CMakeLists.txt
+++ llvm/trunk/tools/llvm-shlib/CMakeLists.txt
@@ -164,9 +164,17 @@
 
   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 )
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60025.193311.patch
Type: text/x-patch
Size: 1033 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190402/074b14dc/attachment.bin>