Skip to content

Commit d2b73ca

Browse files
committed
cmake: remove GAME_PIE
1 parent 9e57ea9 commit d2b73ca

File tree

4 files changed

+1
-12
lines changed

4 files changed

+1
-12
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,6 @@ endif()
464464
include(DaemonNacl)
465465
if (NACL)
466466
add_library(srclibs-nacl-module EXCLUDE_FROM_ALL ${NACLLIST_MODULE})
467-
set_target_properties(srclibs-nacl-module PROPERTIES POSITION_INDEPENDENT_CODE ${NACL_PIE} FOLDER "libs")
468467
set(LIBS_BASE ${LIBS_BASE} srclibs-nacl-module)
469468
else()
470469
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
@@ -491,7 +491,7 @@ else()
491491
try_c_cxx_flag(FNO_STRICT_OVERFLOW "-fno-strict-overflow")
492492
try_c_cxx_flag(WSTACK_PROTECTOR "-Wstack-protector")
493493

494-
if (NOT NACL OR (NACL AND NACL_PIE))
494+
if (NOT NACL)
495495
# The -pie flag requires -fPIC:
496496
# > ld: error: relocation R_X86_64_64 cannot be used against local symbol; recompile with -fPIC
497497
# This flag isn't used on macOS:

cmake/DaemonGame.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ option(BUILD_GAME_NATIVE_EXE "Build native executable, which might be used for b
4040

4141
include(ExternalProject)
4242
include(DaemonPlatform/Platform)
43-
# TODO: Delete when Game uses NACL_PIE instead of GAME_PIE.
44-
set(GAME_PIE ${NACL_PIE})
4543

4644
# Do not report unused native compiler if native vms are not built.
4745
# If only NACL vms are built, this will be reported in chainloaded build.

cmake/DaemonPlatform/Platform.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,3 @@ include(${CMAKE_CURRENT_LIST_DIR}/SourceGenerator.cmake)
22
include(${CMAKE_CURRENT_LIST_DIR}/System.cmake)
33
include(${CMAKE_CURRENT_LIST_DIR}/Architecture.cmake)
44
include(${CMAKE_CURRENT_LIST_DIR}/Compiler.cmake)
5-
6-
if (NACL AND DAEMON_CXX_COMPILER_Saigo)
7-
# Saigo clang reports weird errors when building some Unvanquished cgame and sgame arm nexe with PIE.
8-
# Saigo clang crashes when building Unvanquished amd64 cgame with PIE, sgame builds properly though.
9-
set(NACL_PIE 0)
10-
else()
11-
set(NACL_PIE 1)
12-
endif()

0 commit comments

Comments
 (0)