cmake: use PIE option set by the toolchain if set when building the game

Author: illwieckz

CMakeLists.txt

@@ -546,7 +546,7 @@ endif()
 include(DaemonNacl)
 if (NACL)
     add_library(srclibs-nacl-module EXCLUDE_FROM_ALL ${NACLLIST_MODULE})
-    set_target_properties(srclibs-nacl-module PROPERTIES POSITION_INDEPENDENT_CODE 1 FOLDER "libs")
+    set_target_properties(srclibs-nacl-module PROPERTIES POSITION_INDEPENDENT_CODE ${GAME_PIE} FOLDER "libs")
     set(LIBS_BASE ${LIBS_BASE} srclibs-nacl-module)
 else()
     add_library(srclibs-nacl-native EXCLUDE_FROM_ALL ${NACLLIST_NATIVE})
@@ -620,7 +620,7 @@ if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP OR NACL)
         find_package(ZLIB REQUIRED)
     else()
         add_library(srclibs-zlib EXCLUDE_FROM_ALL ${ZLIBLIST})
-        set_target_properties(srclibs-zlib PROPERTIES POSITION_INDEPENDENT_CODE 1 FOLDER "libs")
+        set_target_properties(srclibs-zlib PROPERTIES POSITION_INDEPENDENT_CODE ${GAME_PIE} FOLDER "libs")
         set(ZLIB_INCLUDE_DIRS ${LIB_DIR}/zlib)
         set(ZLIB_LIBRARIES srclibs-zlib)
     endif()

cmake/toolchain-pnacl.cmake

@@ -83,6 +83,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
 
 set(NACL ON)
 
+set(GAME_PIE 1)
+set(GAME_PIE_SET ON)
+
 set(CMAKE_C_FLAGS "")
 set(CMAKE_CXX_FLAGS "")
 

cmake/toolchain-saigo.cmake

@@ -41,7 +41,16 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
 
 set(NACL ON)
-add_definitions(-DUSE_NACL_SAIGO)
+
+# Saigo clang reports weird errors when building some cgame and sgame arm nexe with PIE.
+# Saigo clang crashes when building amd64 cgame with PIE, sgame builds properly though.
+if (NACL_TARGET STREQUAL "armhf" OR NACL_TARGET STREQUAL "amd64")
+	set(GAME_PIE 0)
+else()
+	set(GAME_PIE 1)
+endif()
+
+set(GAME_PIE_SET ON)
 
 set(CMAKE_C_FLAGS "")
 set(CMAKE_CXX_FLAGS "")