Skip to content

Commit f350a60

Browse files
committed
cmake: remove GAME_PIE entirely
1 parent ca337de commit f350a60

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,6 @@ endif()
465465
include(DaemonNacl)
466466
if (NACL)
467467
add_library(srclibs-nacl-module EXCLUDE_FROM_ALL ${NACLLIST_MODULE})
468-
set_target_properties(srclibs-nacl-module PROPERTIES POSITION_INDEPENDENT_CODE ${GAME_PIE} FOLDER "libs")
469468
set(LIBS_BASE ${LIBS_BASE} srclibs-nacl-module)
470469
else()
471470
add_library(srclibs-nacl-native EXCLUDE_FROM_ALL ${NACLLIST_NATIVE})

cmake/DaemonFlags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ else()
495495
try_c_cxx_flag(FNO_STRICT_OVERFLOW "-fno-strict-overflow")
496496
try_c_cxx_flag(WSTACK_PROTECTOR "-Wstack-protector")
497497

498-
if (NOT NACL OR (NACL AND GAME_PIE))
498+
if (NOT NACL)
499499
# The -pie flag requires -fPIC:
500500
# > ld: error: relocation R_X86_64_64 cannot be used against local symbol; recompile with -fPIC
501501
# This flag isn't used on macOS:

cmake/DaemonPlatform.cmake

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,5 @@ else()
4040
message( FATAL_ERROR "Platform not supported" )
4141
endif()
4242

43-
if (NACL AND USE_NACL_SAIGO)
44-
# Saigo clang reports weird errors when building some cgame and sgame arm nexe with PIE.
45-
# Saigo clang crashes when building amd64 cgame with PIE, sgame builds properly though.
46-
set(GAME_PIE 0)
47-
else()
48-
set(GAME_PIE 1)
49-
endif()
50-
51-
5243
include(DaemonArchitecture)
5344
include(DaemonCompiler)

0 commit comments

Comments
 (0)