From 4cdd6c845fc675fd2d5b0bfa2329304ec34099f4 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 26 Nov 2016 16:17:04 +0100
Subject: [PATCH] Merge with develop

---
 code/CMakeModules/nel.cmake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 566be476b..90a0925bb 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -927,7 +927,12 @@ MACRO(NL_SETUP_BUILD)
     ENDIF()
 
     # hardening
-    SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now")
+    SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-z,relro -Wl,-z,now")
+    
+    IF(NOT APPLE)
+      # hardening
+      SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-Bsymbolic-functions")
+    ENDIF()
 
     IF(WITH_SYMBOLS)
       SET(NL_RELEASE_CFLAGS "${NL_RELEASE_CFLAGS} -g")