summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Pikuła <m.pikula@partner.samsung.com>2022-10-17 23:30:29 +0200
committerMarek Pikuła <m.pikula@partner.samsung.com>2022-12-23 15:35:18 +0100
commit4d957e08b5710838cea856ea2bb93850b164f5bf (patch)
tree5cbac5db7d46baecbb2b6cf80d6d5facb67e2d4b
parent3550c8018ab83335049edc7735485e7d30782f4e (diff)
downloadbuxton2-4d957e08b5710838cea856ea2bb93850b164f5bf.tar.gz
buxton2-4d957e08b5710838cea856ea2bb93850b164f5bf.tar.bz2
buxton2-4d957e08b5710838cea856ea2bb93850b164f5bf.zip
Link with libatomic
From glibc 2.34 (upgrade needed for RISC-V port) libatomic needs to be explicitly specified for linker. Change-Id: I1475115f7cedaefefce80cd8713d423aa6236be2
-rw-r--r--daemon/CMakeLists.txt3
-rw-r--r--lib/CMakeLists.txt2
2 files changed, 2 insertions, 3 deletions
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index dd8f5df..f8e51db 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -28,6 +28,5 @@ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES
LINK_FLAGS "-fPIE"
COMPILE_FLAGS "${DAEMON_CFLAGS}"
)
-TARGET_LINK_LIBRARIES(${TARGET} ${PKGS_LDFLAGS} ${D_PKGS_LDFLAGS} -ldl "-Wl,-z,relro")
+TARGET_LINK_LIBRARIES(${TARGET} ${PKGS_LDFLAGS} ${D_PKGS_LDFLAGS} atomic -ldl "-Wl,-z,relro")
INSTALL(TARGETS ${TARGET} DESTINATION sbin)
-
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e5e2474..7c1d1dc 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -14,7 +14,7 @@ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES
VERSION ${VERSION}
SOVERSION ${MAJVER}
)
-TARGET_LINK_LIBRARIES(${TARGET} ${PKGS_LDFLAGS} pthread)
+TARGET_LINK_LIBRARIES(${TARGET} ${PKGS_LDFLAGS} pthread atomic)
INSTALL(TARGETS ${TARGET} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
# buxton2.pc