646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c559bf5..42ed617 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -106,7 +106,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
|
|
elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
|
|
add_definitions(-DRELEASE)
|
|
if (NOT MSVC)
|
|
- add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
|
|
+ add_compile_options(-O3)
|
|
endif()
|
|
else()
|
|
message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
|
|
@@ -116,19 +116,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
|
|
add_compile_options(-fno-omit-frame-pointer)
|
|
endif()
|
|
|
|
-# Linux GCC LTO plugin fix.
|
|
-if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_TYPE MATCHES "^Rel"))
|
|
- # To force errors if LTO was not enabled.
|
|
- add_compile_options(-fno-fat-lto-objects)
|
|
- # To fix ar and ranlib "plugin needed to handle lto object".
|
|
- string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
|
|
- file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
|
|
- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
|
|
- set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
|
|
- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
|
|
- set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
|
|
-endif()
|
|
-
|
|
message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
|
|
|
|
if (PLATFORM_LINUX OR PLATFORM_ANDROID)
|