Moved gcc13 flags for freebsd-gcc13 in cmake/cflags-ppc64le.make

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62b4829f0557e4581fdf642ae2a726898f4aefc6..1cb77ffd3f5b2c04484f37773f97fbe43e87f05a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,14 +141,6 @@ elseif (ARCH_ARM32 OR ARCH_AARCH64)
     include (${CMAKE_MODULE_PATH}/cflags-arm.cmake)
 elseif (ARCH_PPC64EL)
     include (${CMAKE_MODULE_PATH}/cflags-ppc64le.cmake)
-    
-    # fix unit-internal seg fault for freebsd and gcc13
-    if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-    endif()
-
 else ()
     message(FATAL_ERROR "Unsupported platform")
 endif ()

diff --git a/cmake/cflags-ppc64le.cmake b/cmake/cflags-ppc64le.cmake
index 2ea9f1ba6997d12914eddf1f3dfa634d457ddf9c..a5b8d93b538f79e7462300adb731493c68b11f67 100644 (file)
--- a/cmake/cflags-ppc64le.cmake
+++ b/cmake/cflags-ppc64le.cmake
@@ -16,3 +16,12 @@ int main() {
 if (NOT HAVE_VSX)
     message(FATAL_ERROR "VSX support required for Power support")
 endif ()
+
+# fix unit-internal seg fault for freebsd and gcc13
+if (FREEBSD AND CMAKE_COMPILER_IS_GNUCXX)
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "13")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+    endif ()
+endif ()