darwin-isysroot patch for cmake-3.17+

cmake-3.17.4-darwin-isysroot.patch (text/plain), 2.32 KB, created by Jacob Floyd on 2020-11-28 23:15:43 UTC

Do not detect Xcode and set -isysroot for its SDK, since that messes up
our toolchain, and hence makes any compilation fail, bug #445308

--- cmake-3.17.4/Modules/Platform/Darwin-Initialize.cmake	2020-07-30 09:30:07.000000000 -0500
+++ cmake-3.17.4/Modules/Platform/Darwin-Initialize.cmake.updated	2020-11-27 22:25:02.000000000 -0600
@@ -1,16 +1,16 @@
 # Ask xcode-select where to find /Developer or fall back to ancient location.
-execute_process(COMMAND xcode-select -print-path
-  OUTPUT_VARIABLE _stdout
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-  ERROR_VARIABLE _stderr
-  RESULT_VARIABLE _failed)
-if(NOT _failed AND IS_DIRECTORY ${_stdout})
-  set(OSX_DEVELOPER_ROOT ${_stdout})
-elseif(IS_DIRECTORY "/Developer")
-  set(OSX_DEVELOPER_ROOT "/Developer")
-else()
+#execute_process(COMMAND xcode-select -print-path
+#  OUTPUT_VARIABLE _stdout
+#  OUTPUT_STRIP_TRAILING_WHITESPACE
+#  ERROR_VARIABLE _stderr
+#  RESULT_VARIABLE _failed)
+#if(NOT _failed AND IS_DIRECTORY ${_stdout})
+#  set(OSX_DEVELOPER_ROOT ${_stdout})
+#elseif(IS_DIRECTORY "/Developer")
+#  set(OSX_DEVELOPER_ROOT "/Developer")
+#else()
   set(OSX_DEVELOPER_ROOT "")
-endif()
+#endif()
 
 execute_process(COMMAND sw_vers -productVersion
   OUTPUT_VARIABLE CURRENT_OSX_VERSION
@@ -34,10 +34,10 @@
 # CMAKE_OSX_DEPLOYMENT_TARGET
 
 # Set cache variable - end user may change this during ccmake or cmake-gui configure.
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND _CURRENT_OSX_VERSION VERSION_GREATER 10.3)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
-    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
-endif()
+#if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND _CURRENT_OSX_VERSION VERSION_GREATER 10.3)
+#  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
+#    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
+#endif()
 
 #----------------------------------------------------------------------------
 # CMAKE_OSX_SYSROOT
@@ -275,7 +275,7 @@
     "Architecture dependent sysroots, one per CMAKE_OSX_ARCHITECTURES")
 endfunction()
 
-_apple_resolve_multi_arch_sysroots()
+#_apple_resolve_multi_arch_sysroots()
 
 # Transform CMAKE_OSX_SYSROOT to absolute path
 set(_CMAKE_OSX_SYSROOT_PATH "")