Revert "[cmake] Xcode 14 warns about -undefined dynamic_lookup; sim…

…ply suppress:" See #11937 for why `-flat_namespace` is bad. This reverts commit a05d4be.
root-project · Jan 19, 2023 · 0e03b6a · 0e03b6a
1 parent aeb5eee
commit 0e03b6a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/bindings/jupyroot/CMakeLists.txt b/bindings/jupyroot/CMakeLists.txt
@@ -47,7 +47,7 @@ foreach(val RANGE ${how_many_pythons})
     set_target_properties(${libname} PROPERTIES SUFFIX ".pyd")
     target_link_libraries(${libname} PUBLIC Core  ${python_library})
   elseif(APPLE)
-    target_link_libraries(${libname} PUBLIC -Wl,-bind_at_load -Wl,-flat_namespace -Wl,-undefined -Wl,suppress Core)
+    target_link_libraries(${libname} PUBLIC -Wl,-bind_at_load -Wl,-undefined -Wl,dynamic_lookup Core)
   else()
     target_link_libraries(${libname} PUBLIC -Wl,--unresolved-symbols=ignore-all Core)
   endif()

diff --git a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
@@ -63,7 +63,7 @@ foreach(val RANGE ${how_many_pythons})
     set_target_properties(${libname} PROPERTIES PREFIX "lib")
     set_target_properties(${libname} PROPERTIES SUFFIX ".pyd")
   elseif(APPLE)
-    target_link_libraries(${libname} PUBLIC -Wl,-bind_at_load -Wl,-flat_namespace -Wl,-undefined -Wl,suppress cppyy_backend${python_under_version_string})
+    target_link_libraries(${libname} PUBLIC -Wl,-bind_at_load -Wl,-undefined -Wl,dynamic_lookup cppyy_backend${python_under_version_string})
   else()
     target_link_libraries(${libname} PUBLIC -Wl,--unresolved-symbols=ignore-all cppyy_backend${python_under_version_string})
   endif()

diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
@@ -168,7 +168,7 @@ foreach(val RANGE ${how_many_pythons})
     set_target_properties(${libname} PROPERTIES SUFFIX ".pyd")
     target_link_libraries(${libname} PUBLIC Core Tree cppyy${python_under_version_string})
   elseif(APPLE)
-    target_link_libraries(${libname} PUBLIC -Wl,-bind_at_load -Wl,-flat_namespace -Wl,-undefined -Wl,suppress Core Tree cppyy${python_under_version_string})
+    target_link_libraries(${libname} PUBLIC -Wl,-bind_at_load -Wl,-undefined -Wl,dynamic_lookup Core Tree cppyy${python_under_version_string})
   else()
     target_link_libraries(${libname} PUBLIC -Wl,--unresolved-symbols=ignore-all Core Tree cppyy${python_under_version_string})
   endif()

diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
@@ -190,7 +190,7 @@ if(MSVC)
 endif()
 
 if(APPLE)
-  target_link_libraries(Cling PUBLIC -Wl,-bind_at_load -Wl,-flat_namespace -Wl,-undefined -Wl,suppress)
+  target_link_libraries(Cling PUBLIC -Wl,-bind_at_load -Wl,-undefined -Wl,dynamic_lookup)
 elseif(NOT MSVC)
   target_link_libraries(Cling PUBLIC -Wl,--unresolved-symbols=ignore-in-object-files)
 endif()
diff --git a/interpreter/cling/tools/plugins/example/CMakeLists.txt b/interpreter/cling/tools/plugins/example/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 
 set_target_properties(clingDemoPlugin PROPERTIES  LIBRARY_OUTPUT_DIRECTORY ".")
 if(APPLE)
-  target_link_libraries(clingDemoPlugin PUBLIC -Wl,-bind_at_load -Wl,-flat_namespace -Wl,-undefined -Wl,suppress)
+  target_link_libraries(clingDemoPlugin PUBLIC -Wl,-bind_at_load -Wl,-undefined -Wl,dynamic_lookup)
 elseif(NOT MSVC)
   target_link_libraries(clingDemoPlugin PUBLIC -Wl,--unresolved-symbols=ignore-in-object-files)
 endif()

diff --git a/montecarlo/pythia6/CMakeLists.txt b/montecarlo/pythia6/CMakeLists.txt
@@ -14,7 +14,7 @@ if(pythia6_nolink)
   if(CMAKE_SYSTEM_NAME STREQUAL Linux)
     string(REGEX REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
   elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flat_namespace -undefined suppress")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup")
   endif()
 else()
   if(MSVC)