Page MenuHomeFreeBSD
Files F162844791

D20268.id57423.diff
No OneTemporary
Actions

D20268.id57423.diff
View Options

Index: games/fs2open/files/patch-cmake_toolchain-clang.cmake
===================================================================
--- games/fs2open/files/patch-cmake_toolchain-clang.cmake
+++ games/fs2open/files/patch-cmake_toolchain-clang.cmake
@@ -1,11 +1,22 @@
---- cmake/toolchain-clang.cmake.orig 2018-06-24 19:14:21 UTC
+--- cmake/toolchain-clang.cmake.orig 2017-08-22 16:56:27 UTC
+++ cmake/toolchain-clang.cmake
-@@ -80,7 +80,7 @@ if(SUPPORTS_SHIFT_NEGATIVE_VALUE)
+@@ -7,10 +7,6 @@ MESSAGE(STATUS "Doing configuration specific to clang.
+ option(CLANG_ENABLE_LEAK_CHECK "Enable -fsanitize=leak" OFF)
+ option(CLANG_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize=address" OFF)
+
+-# These are the default values
+-set(C_BASE_FLAGS "-march=native -pipe")
+-set(CXX_BASE_FLAGS "-march=native -pipe")
+-
+ # For C and C++, the values can be overwritten independently
+ if(DEFINED ENV{CXXFLAGS})
+ set(CXX_BASE_FLAGS $ENV{CXXFLAGS})
+@@ -80,7 +76,7 @@ if(SUPPORTS_SHIFT_NEGATIVE_VALUE)
set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-shift-negative-value")
endif()
-set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable")
-+set(COMPILER_FLAGS_RELEASE "-Wno-unused-variable")
++set(COMPILER_FLAGS_RELEASE "-Wno-unused-variable -fuse-ld=bfd")
set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")
Index: games/fs2open/files/patch-cmake_toolchain-gcc.cmake
===================================================================
--- games/fs2open/files/patch-cmake_toolchain-gcc.cmake
+++ games/fs2open/files/patch-cmake_toolchain-gcc.cmake
@@ -1,6 +1,6 @@
---- 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
+@@ -87,7 +87,7 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-deprecated
set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-parameter")
Index: games/fs2open/files/patch-freespace2_CMakeLists.txt
===================================================================
--- games/fs2open/files/patch-freespace2_CMakeLists.txt
+++ games/fs2open/files/patch-freespace2_CMakeLists.txt
@@ -1,6 +1,6 @@
---- freespace2/CMakeLists.txt.orig 2018-06-24 19:15:59 UTC
+--- freespace2/CMakeLists.txt.orig 2017-08-22 16:56:27 UTC
+++ freespace2/CMakeLists.txt
-@@ -23,7 +23,7 @@ ADD_EXECUTABLE(Freespace2 ${EXE_GUI_TYPE
+@@ -23,7 +23,7 @@ ADD_EXECUTABLE(Freespace2 ${EXE_GUI_TYPE} ${FREESPACE_
include(resources.cmake)

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 18, 1:07 PM (18 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35197645
Default Alt Text
D20268.id57423.diff (2 KB)

Event Timeline