diff options
Diffstat (limited to 'games/fs2open/files/patch-cmake_toolchain-gcc.cmake')
| -rw-r--r-- | games/fs2open/files/patch-cmake_toolchain-gcc.cmake | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/games/fs2open/files/patch-cmake_toolchain-gcc.cmake b/games/fs2open/files/patch-cmake_toolchain-gcc.cmake index db3893e3b05b..e3b6613deaa7 100644 --- a/games/fs2open/files/patch-cmake_toolchain-gcc.cmake +++ b/games/fs2open/files/patch-cmake_toolchain-gcc.cmake @@ -1,6 +1,17 @@ ---- cmake/toolchain-gcc.cmake.orig 2018-06-24 19:15:11 UTC +--- cmake/toolchain-gcc.cmake.orig 2017-08-22 16:56:27 UTC +++ cmake/toolchain-gcc.cmake -@@ -87,7 +87,7 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -W +@@ -10,8 +10,8 @@ option(GCC_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize + option(GCC_ENABLE_SANITIZE_UNDEFINED "Enable -fsanitize=undefined" OFF) + + # These are the default values +-set(C_BASE_FLAGS "-march=native -pipe") +-set(CXX_BASE_FLAGS "-march=native -pipe") ++set(C_BASE_FLAGS "${CMAKE_C_FLAGS_RELEASE}" ) ++set(CXX_BASE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}") + + # For C and C++, the values can be overwritten independently + if(DEFINED ENV{CFLAGS}) +@@ -87,7 +87,7 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-deprecated set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-parameter") @@ -9,3 +20,12 @@ set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow") +@@ -100,8 +100,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE}) + + set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) + set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) +- +-set(CMAKE_EXE_LINKER_FLAGS "") + + IF (MINGW) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++ -Wl,--enable-auto-import") |