From 093245ed9ee495146b3478447473ad21ae237cb1 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Thu, 23 Sep 2021 00:48:24 -0700 Subject: [PATCH] [CMake] Pass llvm-readelf to CMake external builds This matches other LLVM binary tools. Differential Revision: https://reviews.llvm.org/D110313 --- llvm/cmake/modules/LLVMExternalProjectUtils.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake index 7c91150..61f351c 100644 --- a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake +++ b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake @@ -90,7 +90,7 @@ function(llvm_ExternalProject_Add name source_dir) 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 @@ function(llvm_ExternalProject_Add name source_dir) 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() -- 2.7.4