From 2f766ec037b19e39daee58a9d4ee50a51415b99d Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool <compnerd@compnerd.org> Date: Tue, 17 Dec 2024 09:14:06 -0800 Subject: [PATCH] Revert "[Linux] Enable build-ids. (#4995)" This reverts commit f186ff8801cf2ec5e5e530d08207dd17375e1cbb. This is incorrectly being applied to Windows builds as well. --- CMakeLists.txt | 2 -- Sources/Foundation/CMakeLists.txt | 4 ---- Sources/FoundationNetworking/CMakeLists.txt | 4 ---- Sources/FoundationXML/CMakeLists.txt | 4 ---- 4 files changed, 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 265c9d3de7..4000b7c199 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,8 +98,6 @@ FetchContent_MakeAvailable(SwiftFoundationICU SwiftFoundation) include(CheckLinkerFlag) include(CheckSymbolExists) -check_linker_flag(C "LINKER:--build-id=sha1" LINKER_SUPPORTS_BUILD_ID) - # Detect if the system libc defines symbols for these functions. # If it is not availble, swift-corelibs-foundation has its own implementations # that will be used. If it is available, it should not redefine them. diff --git a/Sources/Foundation/CMakeLists.txt b/Sources/Foundation/CMakeLists.txt index 108dfb1c19..caa79729d1 100644 --- a/Sources/Foundation/CMakeLists.txt +++ b/Sources/Foundation/CMakeLists.txt @@ -175,9 +175,5 @@ if(dispatch_FOUND) swiftDispatch) endif() -if(LINKER_SUPPORTS_BUILD_ID) - target_link_options(Foundation PRIVATE "LINKER:--build-id=sha1") -endif() - set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS Foundation) _foundation_install_target(Foundation) diff --git a/Sources/FoundationNetworking/CMakeLists.txt b/Sources/FoundationNetworking/CMakeLists.txt index 6ad40968dc..f0167304ff 100644 --- a/Sources/FoundationNetworking/CMakeLists.txt +++ b/Sources/FoundationNetworking/CMakeLists.txt @@ -77,9 +77,5 @@ set_target_properties(FoundationNetworking PROPERTIES INSTALL_RPATH "$ORIGIN" INSTALL_REMOVE_ENVIRONMENT_RPATH ON) -if(LINKER_SUPPORTS_BUILD_ID) - target_link_options(FoundationNetworking PRIVATE "LINKER:--build-id=sha1") -endif() - set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS FoundationNetworking) _foundation_install_target(FoundationNetworking) diff --git a/Sources/FoundationXML/CMakeLists.txt b/Sources/FoundationXML/CMakeLists.txt index 5c8a0fb301..a51124e81c 100644 --- a/Sources/FoundationXML/CMakeLists.txt +++ b/Sources/FoundationXML/CMakeLists.txt @@ -50,9 +50,5 @@ set_target_properties(FoundationXML PROPERTIES INSTALL_RPATH "$ORIGIN" INSTALL_REMOVE_ENVIRONMENT_RPATH ON) -if(LINKER_SUPPORTS_BUILD_ID) - target_link_options(FoundationXML PRIVATE "LINKER:--build-id=sha1") -endif() - set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS FoundationXML) _foundation_install_target(FoundationXML)