mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-16 04:42:57 +00:00
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ali Mohammad Pur <ali.mpfard@gmail.com>
|
|
Date: Thu, 24 Feb 2022 03:47:50 +0330
|
|
Subject: [PATCH] Explicitly link with pthread
|
|
|
|
The cmakelists was using the wrong variable to link against pthread.
|
|
---
|
|
CMakeLists.txt | 5 +++--
|
|
tests/CMakeLists.txt | 12 ++++++------
|
|
2 files changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c8ebd9b..e9c52f1 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -52,7 +52,8 @@ IF(enable_threads)
|
|
FIND_PACKAGE(Threads REQUIRED)
|
|
MESSAGE("Thread Model: ${CMAKE_THREAD_LIBS_INIT}" )
|
|
INCLUDE_DIRECTORIES(${Threads_INCLUDE_DIR})
|
|
- SET(LIBS ${LIBS} ${Threads_LIBRARIES})
|
|
+ SET(LIBS ${LIBS} ${Threads_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
+ MESSAGE("Libs: ${LIBS}" )
|
|
ENDIF(enable_threads)
|
|
|
|
OPTION(enable_handle_fork "Attempt to ensure a usable collector after fork()" ON)
|
|
@@ -235,7 +236,7 @@ ENDIF(enable_checksums)
|
|
ADD_LIBRARY( gc-lib STATIC ${SRC})
|
|
SET_TARGET_PROPERTIES(gc-lib PROPERTIES
|
|
COMPILE_DEFINITIONS GC_NOT_DLL)
|
|
-#TODO TARGET_LINK_LIBRARIES(... ... ${LIBS})
|
|
+TARGET_LINK_LIBRARIES(gc-lib ${LIBS})
|
|
|
|
ADD_LIBRARY( gcmt-dll SHARED ${SRC})
|
|
|
|
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
index 3c84220..5e15727 100644
|
|
--- a/tests/CMakeLists.txt
|
|
+++ b/tests/CMakeLists.txt
|
|
@@ -23,25 +23,25 @@ SET_SOURCE_FILES_PROPERTIES(
|
|
PROPERTIES LANGUAGE CXX)
|
|
|
|
ADD_EXECUTABLE(gctest WIN32 test.c)
|
|
-TARGET_LINK_LIBRARIES(gctest gc-lib)
|
|
+TARGET_LINK_LIBRARIES(gctest gc-lib ${LIBS})
|
|
ADD_TEST(NAME gctest COMMAND gctest)
|
|
|
|
ADD_EXECUTABLE(hugetest huge_test.c)
|
|
-TARGET_LINK_LIBRARIES(hugetest gc-lib)
|
|
+TARGET_LINK_LIBRARIES(hugetest gc-lib ${LIBS})
|
|
ADD_TEST(NAME hugetest COMMAND hugetest)
|
|
|
|
ADD_EXECUTABLE(leaktest leak_test.c)
|
|
-TARGET_LINK_LIBRARIES(leaktest gc-lib)
|
|
+TARGET_LINK_LIBRARIES(leaktest gc-lib ${LIBS})
|
|
ADD_TEST(NAME leaktest COMMAND leaktest)
|
|
|
|
ADD_EXECUTABLE(middletest middle.c)
|
|
-TARGET_LINK_LIBRARIES(middletest gc-lib)
|
|
+TARGET_LINK_LIBRARIES(middletest gc-lib ${LIBS})
|
|
ADD_TEST(NAME middletest COMMAND middletest)
|
|
|
|
ADD_EXECUTABLE(realloc_test realloc_test.c)
|
|
-TARGET_LINK_LIBRARIES(realloc_test gc-lib)
|
|
+TARGET_LINK_LIBRARIES(realloc_test gc-lib ${LIBS})
|
|
ADD_TEST(NAME realloc_test COMMAND realloc_test)
|
|
|
|
ADD_EXECUTABLE(smashtest smash_test.c)
|
|
-TARGET_LINK_LIBRARIES(smashtest gc-lib)
|
|
+TARGET_LINK_LIBRARIES(smashtest gc-lib ${LIBS})
|
|
ADD_TEST(NAME smashtest COMMAND smashtest)
|