Merge with develop

--HG-- branch : compatibility-develop
8 years ago · beb8ffc847
parent 6150489f57 4f5d3afd51
commit beb8ffc847
1 changed files with 6 additions and 1 deletions
--- 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")