Skip to content

Fix mistake when setting linker flags #1574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
illwieckz merged 2 commits into from
Mar 5, 2025
Merged

Fix mistake when setting linker flags #1574

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01f3070
cmake: fix mistake when setting linker flags
illwieckz Mar 3, 2025
9b76c7b
cmake: only set -pie if -fPIC is set, also fixes an harmless typo
illwieckz Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cmake/DaemonFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ macro(try_linker_flag PROP FLAG)
check_C_compiler_flag(${FLAG} FLAG_${PROP})
set(CMAKE_REQUIRED_FLAGS "")
if (FLAG_${PROP})
set_exe_linker_flag(${FLAG} ${ARGN})
set_linker_flag(${FLAG} ${ARGN})
endif()
endmacro()

Expand All @@ -158,7 +158,7 @@ macro(try_exe_linker_flag PROP FLAG)
set(CMAKE_REQUIRED_FLAGS "")

if (FLAG_${PROP})
set_linker_flag(${FLAG} ${ARGN})
set_exe_linker_flag(${FLAG} ${ARGN})
endif()
endmacro()

Expand Down Expand Up @@ -395,11 +395,13 @@ else()
try_c_cxx_flag(WSTACK_PROTECTOR "-Wstack-protector")

if (NOT NACL OR (NACL AND GAME_PIE))
try_c_cxx_flag(FPIE "-fPIC")
try_c_cxx_flag(FPIC "-fPIC")

# The -pie flag requires -fPIC:
# > ld: error: relocation R_X86_64_64 cannot be used against local symbol; recompile with -fPIC
# This flag isn't used on macOS:
# > clang: warning: argument unused during compilation: '-pie' [-Wunused-command-line-argument]
if (NOT APPLE)
if (FLAG_FPIC AND NOT APPLE)
try_exe_linker_flag(LINKER_PIE "-pie")
endif()
endif()
Expand Down