(nifi-minifi-cpp) 06/06: MINIFICPP-1757 remove problematic linker flags on macos/gcc

[martinzink]

This is an automated email from the ASF dual-hosted git repository.

martinzink pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit fc9e50769378744bdb19bd706aa2a075878f5614
Author: Marton Szasz <sza...@apache.org>
AuthorDate: Tue Mar 12 13:53:21 2024 +0100

    MINIFICPP-1757 remove problematic linker flags on macos/gcc
    
    Closes #1741
    Signed-off-by: Martin Zink <martinz...@apache.org>
---
 cmake/Extensions.cmake        | 2 +-
 controller/CMakeLists.txt     | 2 +-
 encrypt-config/CMakeLists.txt | 2 +-
 minifi_main/CMakeLists.txt    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/Extensions.cmake b/cmake/Extensions.cmake
index 176b08f97..41d0cc9a9 100644
--- 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
index 4eaa1cf07..1e632584c 100644
--- 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
index 1b8129fb8..cfa436564 100644
--- 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
index 9039d146c..337b472ea 100644
--- 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)