View | Details | Raw Unified | Return to bug 230603 | Differences between
and this patch

Collapse All | Expand All

(-)astro/kstars/patch-git_7e1390 (+29 lines)
Line 0 Link Here
1
From 7e13909f27a4ea9518f4d7669340dbbef4423aef Mon Sep 17 00:00:00 2001
2
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
3
Date: Tue, 14 Aug 2018 07:52:36 +0200
4
Subject: [PATCH] Don't add "-z nodump" for lld -- it does not support it.
5
6
---
7
 CMakeLists.txt | 6 +++++-
8
 1 file changed, 5 insertions(+), 1 deletion(-)
9
10
diff --git CMakeLists.txt CMakeLists.txt
11
index 180deacde..31aad7707 100644
12
--- CMakeLists.txt
13
+++ CMakeLists.txt
14
@@ -283,7 +283,11 @@ IF (UNIX OR APPLE OR ANDROID)
15
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SEC_COMP_FLAGS}")
16
     SET(SEC_LINK_FLAGS "")
17
     IF (NOT APPLE)
18
-        SET(SEC_LINK_FLAGS "${SEC_LINK_FLAGS} -Wl,-z,nodump -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
19
+        SET(SEC_LpINK_FLAGS "${SEC_LINK_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
20
+        execute_process(COMMAND ${CMAKE_LINKER} "-v" OUTPUT_VARIABLE LD_VERSION)
21
+        IF (NOT LD_VERSION MATCHES "^LLD")
22
+           SET(SEC_LpINK_FLAGS "${SEC_LINK_FLAGS} -Wl,-z,nodump")
23
+        ENDIF()
24
     ENDIF ()
25
     IF (NOT ANDROID AND NOT APPLE)
26
         SET(SEC_LINK_FLAGS "${SEC_LINK_FLAGS} -pie")
27
-- 
28
2.18.0
29

Return to bug 230603