MINIFICPP-1757 remove problematic linker flags on macos/gcc

Closes apache#1741 Signed-off-by: Martin Zink <martinzink@apache.org>
martinzink · Mar 12, 2024 · fc9e507 · fc9e507
1 parent dd8e54e
commit fc9e507
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cmake/Extensions.cmake b/cmake/Extensions.cmake
@@ -70,7 +70,7 @@ macro(register_extension extension-name extension-display-name extension-guard d
         if(WIN32)
             install(TARGETS ${extension-name} RUNTIME DESTINATION extensions COMPONENT ${component-name})
         else()
-            if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+            if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT APPLE)
                 target_link_options(${extension-name} PRIVATE "-Wl,--disable-new-dtags")
             endif()
             if (APPLE)

diff --git a/controller/CMakeLists.txt b/controller/CMakeLists.txt
@@ -48,7 +48,7 @@ set_target_properties(minificontroller PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 if (NOT WIN32)
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT APPLE)
         target_link_options(minificontroller PRIVATE "-Wl,--disable-new-dtags")
     endif()
     if (APPLE)

diff --git a/encrypt-config/CMakeLists.txt b/encrypt-config/CMakeLists.txt
@@ -31,7 +31,7 @@ set_target_properties(encrypt-config PROPERTIES OUTPUT_NAME encrypt-config)
 set_target_properties(encrypt-config PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 if (NOT WIN32)
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT APPLE)
         target_link_options(encrypt-config PRIVATE "-Wl,--disable-new-dtags")
     endif()
     if (APPLE)

diff --git a/minifi_main/CMakeLists.txt b/minifi_main/CMakeLists.txt
@@ -83,7 +83,7 @@ else()
 endif()
 
 if (NOT WIN32)
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT APPLE)
         target_link_options(minifiexe PRIVATE "-Wl,--disable-new-dtags")
     endif()
     if (APPLE)