Skip to content

build: remove unnecessary flag to control the linker #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2019
Merged

build: remove unnecessary flag to control the linker #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ include(CheckLibraryExists)
include(CheckSymbolExists)
include(GNUInstallDirs)
include(SwiftSupport)
include(DispatchUtilities)

set(SWIFT_LIBDIR "lib" CACHE PATH "Library folder name, defined by swift main buildscript")
set(INSTALL_LIBDIR "${SWIFT_LIBDIR}" CACHE PATH "Path where the libraries should be installed")
Expand Down Expand Up @@ -83,18 +82,6 @@ option(ENABLE_DTRACE "enable dtrace support" "")

option(ENABLE_TESTING "build libdispatch tests" ON)

option(USE_LLD_LINKER "use the lld linker" FALSE)

if(NOT USE_LLD_LINKER AND
(CMAKE_SYSTEM_NAME STREQUAL Linux OR
CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR
CMAKE_SYSTEM_NAME STREQUAL Android))
set(USE_GOLD_LINKER_DEFAULT TRUE)
else()
set(USE_GOLD_LINKER_DEFAULT FALSE)
endif()
option(USE_GOLD_LINKER "use the gold linker" ${USE_GOLD_LINKER_DEFAULT})

option(ENABLE_THREAD_LOCAL_STORAGE "enable usage of thread local storage via _Thread_local" ON)
set(DISPATCH_USE_THREAD_LOCAL_STORAGE ${ENABLE_THREAD_LOCAL_STORAGE})

Expand Down
19 changes: 0 additions & 19 deletions cmake/modules/DispatchUtilities.cmake
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,6 @@ if(ENABLE_SWIFT)
PROPERTIES
POSITION_INDEPENDENT_CODE YES)

if(USE_LLD_LINKER)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
set(use_ld_flag -use-ld=lld.exe)
else()
set(use_ld_flag -use-ld=lld)
endif()
elseif(USE_GOLD_LINKER)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
set(use_ld_flag -use-ld=gold.exe)
else()
set(use_ld_flag -use-ld=gold)
endif()
endif()

add_swift_library(swiftDispatch
CFLAGS
-fblocks
Expand All @@ -138,7 +124,6 @@ if(ENABLE_SWIFT)
module-maps
DispatchStubs
LINK_FLAGS
${use_ld_flag}
-lDispatchStubs
-L $<TARGET_LINKER_FILE_DIR:BlocksRuntime>
-lBlocksRuntime
Expand Down Expand Up @@ -260,7 +245,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
"-Xlinker -dead_strip"
"-Xlinker -alias_list -Xlinker ${PROJECT_SOURCE_DIR}/xcodeconfig/libdispatch.aliases")
endif()
dispatch_set_linker(dispatch)

install(TARGETS
dispatch
Expand Down
2 changes: 0 additions & 2 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ endif ()

add_executable(bsdtestharness
bsdtestharness.c)
dispatch_set_linker(bsdtestharness)
target_include_directories(bsdtestharness
PRIVATE
${CMAKE_CURRENT_BINARY_DIR}
Expand Down Expand Up @@ -89,7 +88,6 @@ function(add_unit_test name)
target_compile_options(${name} PRIVATE -fblocks)
target_compile_options(${name} PRIVATE -Wall -Wno-deprecated-declarations)
endif()
dispatch_set_linker(${name})
target_link_libraries(${name}
PRIVATE
dispatch
Expand Down