Merge with develop

--HG-- branch : compatibility-develop
8 years ago · 920f226d98
parent beb8ffc847 3e2c731444
commit 920f226d98
1 changed files with 1 additions and 4 deletions
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@ -926,12 +926,9 @@ MACRO(NL_SETUP_BUILD)
      SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--no-undefined -Wl,--as-needed")
    ENDIF()

-    # hardening
-    SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-z,relro -Wl,-z,now")
-    
    IF(NOT APPLE)
      # hardening
-      SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-Bsymbolic-functions")
+      SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now")
    ENDIF()

    IF(WITH_SYMBOLS)