diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /games/fs2open/files/patch-cmake_toolchain-clang.cmake | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'games/fs2open/files/patch-cmake_toolchain-clang.cmake')
| -rw-r--r-- | games/fs2open/files/patch-cmake_toolchain-clang.cmake | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/games/fs2open/files/patch-cmake_toolchain-clang.cmake b/games/fs2open/files/patch-cmake_toolchain-clang.cmake index e643b93cb9c6..713ccdb2d82a 100644 --- a/games/fs2open/files/patch-cmake_toolchain-clang.cmake +++ b/games/fs2open/files/patch-cmake_toolchain-clang.cmake @@ -1,6 +1,6 @@ ---- cmake/toolchain-clang.cmake.orig 2021-01-27 17:07:03 UTC +--- cmake/toolchain-clang.cmake.orig 2024-10-28 01:17:49 UTC +++ cmake/toolchain-clang.cmake -@@ -10,8 +10,8 @@ option(CLANG_ENABLE_ADDRESS_SANITIZER "Enable -fsaniti +@@ -10,8 +10,8 @@ option(CLANG_USE_LIBCXX "Use libc++" OFF) option(CLANG_USE_LIBCXX "Use libc++" OFF) # These are the default values @@ -11,13 +11,3 @@ # For C and C++, the values can be overwritten independently if(DEFINED ENV{CXXFLAGS}) -@@ -96,9 +96,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 (CLANG_USE_LIBCXX) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++abi") |