Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions cmake/DaemonFlags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,6 @@ else()
# PNaCl only supports libc++ as standard library.
set_c_cxx_flag("-stdlib=libc++")
set_c_cxx_flag("--pnacl-allow-exceptions")
elseif (APPLE)
# Use libc++ on Mac because the shipped libstdc++ version is too old.
set_c_cxx_flag("-stdlib=libc++")
set_linker_flag("-stdlib=libc++")
endif()

# Prevent the generation of STB_GNU_UNIQUE symbols
Expand Down Expand Up @@ -340,7 +336,9 @@ else()

if (NOT NACL OR (NACL AND GAME_PIE))
try_c_cxx_flag(FPIE "-fPIE")
try_linker_flag(LINKER_PIE "-pie")
if (NOT APPLE)
try_linker_flag(LINKER_PIE "-pie")
endif()
endif()

if ("${FLAG_LINKER_PIE}" AND MINGW)
Expand Down
Loading