From c1bca279d01b6e416c1973ca2cbad0ce379e3c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20B=C3=B6rschig?= Date: Fri, 8 Nov 2024 13:42:06 +0100 Subject: [PATCH 1/2] cmake: don`t use linker map on Android --- SilKit/source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SilKit/source/CMakeLists.txt b/SilKit/source/CMakeLists.txt index 322639c43..ea85d8e9c 100644 --- a/SilKit/source/CMakeLists.txt +++ b/SilKit/source/CMakeLists.txt @@ -243,7 +243,7 @@ if (MSVC) PDB_OUTPUT_DIRECTORY_DEBUG ${SILKIT_SYMBOLS_DIR}/Debug LINK_FLAGS "/DEBUG" #make sure the resulting .dll has a .pdb file ) -elseif(UNIX AND NOT APPLE) +elseif(UNIX AND NOT APPLE AND NOT (CMAKE_SYSTEM_NAME MATCHES Android)) #for reproducible builds if(SILKIT_BUILD_REPRODUCIBLE) target_link_options(SilKit From ccace32a357f3c9821cb95f37e2fd49cb6f0a30c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20B=C3=B6rschig?= Date: Mon, 11 Nov 2024 08:40:28 +0100 Subject: [PATCH 2/2] fixup! cmake: don`t use linker map on Android --- SilKit/source/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SilKit/source/CMakeLists.txt b/SilKit/source/CMakeLists.txt index ea85d8e9c..bb81de4f1 100644 --- a/SilKit/source/CMakeLists.txt +++ b/SilKit/source/CMakeLists.txt @@ -243,7 +243,7 @@ if (MSVC) PDB_OUTPUT_DIRECTORY_DEBUG ${SILKIT_SYMBOLS_DIR}/Debug LINK_FLAGS "/DEBUG" #make sure the resulting .dll has a .pdb file ) -elseif(UNIX AND NOT APPLE AND NOT (CMAKE_SYSTEM_NAME MATCHES Android)) +elseif(UNIX AND NOT APPLE) #for reproducible builds if(SILKIT_BUILD_REPRODUCIBLE) target_link_options(SilKit @@ -257,7 +257,9 @@ elseif(UNIX AND NOT APPLE AND NOT (CMAKE_SYSTEM_NAME MATCHES Android)) PRIVATE -Wl,--build-id=sha1) endif() endif() - target_link_options(SilKit PRIVATE "LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/silkit.map") + if(NOT (CMAKE_SYSTEM_NAME MATCHES Android)) + target_link_options(SilKit PRIVATE "LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/silkit.map") + endif() endif() if ((CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang) AND NOT SILKIT_USE_SYSTEM_LIBRARIES)