Merge pull request #439 from GEOS-ESM/bugfix/438-v3-fix-xcode

Author: mathomp4

CHANGELOG.md

@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [3.58.2] - 2025-04-22
+
+### Fixed
+
+- Do not add `ld_classic` flag on macOS with XCode 16.3 or newer. No longer needed.
+
 ## [3.58.1] - 2025-04-03
 
 ### Fixed

compiler/flags/GNU_Fortran.cmake

@@ -135,9 +135,11 @@ if (APPLE)
   execute_process(COMMAND "pkgutil"
                           "--pkg-info=com.apple.pkg.CLTools_Executables"
                   OUTPUT_VARIABLE TEST)
-  string(REGEX REPLACE ".*version: ([0-9]+).*" "\\1" CMDLINE_UTILS_VERSION ${TEST})
-  message(STATUS "Apple command line utils major version is '${CMDLINE_UTILS_VERSION}'")
-  if (${CMDLINE_UTILS_VERSION} VERSION_GREATER 14)
+  # Extract the full version X.Y
+  string(REGEX REPLACE ".*version: ([0-9]+\\.[0-9]+).*" "\\1" CMDLINE_UTILS_VERSION ${TEST})
+  message(STATUS "Apple command line utils version is '${CMDLINE_UTILS_VERSION}'")
+
+  if ((${CMDLINE_UTILS_VERSION} VERSION_GREATER 14) AND (${CMDLINE_UTILS_VERSION} VERSION_LESS 16.3))
     message(STATUS "Adding link options '-Wl,-ld_classic'")
     add_link_options(-Wl,-ld_classic)
   endif ()

compiler/flags/IntelLLVM_Fortran.cmake

@@ -73,7 +73,7 @@ elseif (${proc_description} MATCHES "Intel")
 elseif ( ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
   # This is a fallback for when the above doesn't work. It should work
   # for most x86_64 processors, but it is not guaranteed to be optimal.
-  message(WARNING "Unknown processory type. Defaulting to a generic x86_64 processor. Performance may be suboptimal.")
+  message(WARNING "Unknown processor type. Defaulting to a generic x86_64 processor. Performance may be suboptimal.")
   set (MARCH_FLAG "x86-64")
 else ()
   message(FATAL_ERROR "Unknown processor. Please file an issue at https://github.com/GEOS-ESM/ESMA_cmake")

compiler/flags/Intel_Fortran.cmake

@@ -87,7 +87,7 @@ elseif (${proc_description} MATCHES "Intel")
 elseif ( ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
   # This is a fallback for when the above doesn't work. It should work
   # for most x86_64 processors, but it is not guaranteed to be optimal.
-  message(WARNING "Unknown processory type. Defaulting to a generic x86_64 processor. Performance may be suboptimal.")
+  message(WARNING "Unknown processor type. Defaulting to a generic x86_64 processor. Performance may be suboptimal.")
   set (COREAVX2_FLAG "")
   # Once you are in here, you are probably on Rosetta, but not required. 
   # Still, on Apple Rosetta we also now need to use the ld_classic as the linker
@@ -96,9 +96,12 @@ elseif ( ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
     execute_process(COMMAND "pkgutil"
                             "--pkg-info=com.apple.pkg.CLTools_Executables"
                     OUTPUT_VARIABLE TEST)
-    string(REGEX REPLACE ".*version: ([0-9]+).*" "\\1" CMDLINE_UTILS_VERSION ${TEST})
-    message(STATUS "Apple command line utils major version is '${CMDLINE_UTILS_VERSION}'")
-    if (${CMDLINE_UTILS_VERSION} VERSION_GREATER 14)
+
+    # Extract the full version X.Y
+    string(REGEX REPLACE ".*version: ([0-9]+\\.[0-9]+).*" "\\1" CMDLINE_UTILS_VERSION ${TEST})
+    message(STATUS "Apple command line utils version is '${CMDLINE_UTILS_VERSION}'")
+
+    if ((${CMDLINE_UTILS_VERSION} VERSION_GREATER 14) AND (${CMDLINE_UTILS_VERSION} VERSION_LESS 16.3))
       message(STATUS "Adding link options '-Wl,-ld_classic'")
       add_link_options(-Wl,-ld_classic)
     endif ()