From b94a412c09c7175b85cb8f112118ec3f9dc87421 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 21 Apr 2023 15:43:25 +0200 Subject: [PATCH] tools: build elf-cleaner using system compiler Rather than using the NDK compiler for the host arch and hoping it picks up on system library locations, just use `cc` and rely on the traditional symlink to resolve that to the default host compiler. This should address build errors seen on macOS. Signed-off-by: Jason A. Donenfeld --- tunnel/tools/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tunnel/tools/CMakeLists.txt b/tunnel/tools/CMakeLists.txt index 843374ef..490a1755 100644 --- a/tunnel/tools/CMakeLists.txt +++ b/tunnel/tools/CMakeLists.txt @@ -32,7 +32,7 @@ add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib # Strip unwanted ELF sections to prevent DT_FLAGS_1 warnings on old Android versions file(GLOB ELF_CLEANER_SOURCES elf-cleaner/*.c elf-cleaner/*.cpp) -add_custom_target(elf-cleaner COMMENT "Building elf-cleaner" VERBATIM COMMAND "${CMAKE_C_COMPILER}" +add_custom_target(elf-cleaner COMMENT "Building elf-cleaner" VERBATIM COMMAND cc -O2 -DPACKAGE_NAME="elf-cleaner" -DPACKAGE_VERSION="" -DCOPYRIGHT="" -o "${CMAKE_CURRENT_BINARY_DIR}/elf-cleaner" ${ELF_CLEANER_SOURCES} )