[PATCH] D110313: [CMake] Pass llvm-readelf to CMake external builds

Petr Hosek via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 23 14:16:34 PDT 2021


This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG093245ed9ee4: [CMake] Pass llvm-readelf to CMake external builds (authored by phosek).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D110313

Files:
  llvm/cmake/modules/LLVMExternalProjectUtils.cmake


Index: llvm/cmake/modules/LLVMExternalProjectUtils.cmake
===================================================================
--- llvm/cmake/modules/LLVMExternalProjectUtils.cmake
+++ llvm/cmake/modules/LLVMExternalProjectUtils.cmake
@@ -90,7 +90,7 @@
         list(APPEND ARG_TOOLCHAIN_TOOLS llvm-lib)
       else()
         # TODO: These tools don't fully support Mach-O format yet.
-        list(APPEND ARG_TOOLCHAIN_TOOLS llvm-objcopy llvm-strip)
+        list(APPEND ARG_TOOLCHAIN_TOOLS llvm-objcopy llvm-strip llvm-readelf)
       endif()
     endif()
   endif()
@@ -204,6 +204,9 @@
     if(llvm-strip IN_LIST TOOLCHAIN_TOOLS AND NOT ARG_STRIP_TOOL)
       list(APPEND compiler_args -DCMAKE_STRIP=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-strip${CMAKE_EXECUTABLE_SUFFIX})
     endif()
+    if(llvm-readelf IN_LIST TOOLCHAIN_TOOLS)
+      list(APPEND compiler_args -DCMAKE_READELF=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-readelf${CMAKE_EXECUTABLE_SUFFIX})
+    endif()
     list(APPEND ARG_DEPENDS ${TOOLCHAIN_TOOLS})
   endif()
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D110313.374667.patch
Type: text/x-patch
Size: 1023 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210923/78aa7e59/attachment.bin>


More information about the llvm-commits mailing list