From 9ae2943b30e449a7da7e1b8abeab50c5e9194c58 Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <v.g.vassilev@gmail.com>
Date: Fri, 19 Mar 2021 22:06:59 +0000
Subject: [PATCH] [cmake] Do not bind cling's sysroot to a particular version
of osx sdk.
The CMAKE_OSX_SYSROOT exports the exact version of the sdk which we build
against. However, this means that binary releases become sensitive to minor sdk
upgrades (eg. MacOSX11.1.sdk -> MacOSX11.2.sdk). Our infrastructure is
relatively resilient to such changes.
This patch introduces a workaround to address this issue -- it uses the fact
that the current sdk's parent directory has a symlink MacOSX.sdk which points
to the current sdk.
This should resolve root-project/root#7021.
---
interpreter/cling/lib/Interpreter/CMakeLists.txt | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/interpreter/cling/lib/Interpreter/CMakeLists.txt b/interpreter/cling/lib/Interpreter/CMakeLists.txt
index 5990b90d90e..75396717355 100644
--- a/interpreter/cling/lib/Interpreter/CMakeLists.txt
+++ b/interpreter/cling/lib/Interpreter/CMakeLists.txt
@@ -292,9 +292,22 @@ if (UNIX)
#define CLING_INCLUDE_PATHS \"${CLING_INCLUDE_PATHS}\"
")
if (CMAKE_OSX_SYSROOT)
+ # CMAKE_OSX_SYSROOT hardcodes the concrete version of the sdk
+ # (eg .../MacOSX11.1.sdk) which changes after every update of XCode. We use
+ # the assumption that in the parent folder there is a symlink MacOSX.sdk
+ # which points to the current active sdk. This change allows releases
+ # to work when the users update their sdks.
+ # FIXME: That is a horrible hack and we should teach CIFactory to pick up
+ # the SDK directory at runtime, just as we do for the include paths to C++.
+ set (OSX_SYSROOT_DEFAULT_SDK ${CMAKE_OSX_SYSROOT})
+ if (${OSX_SYSROOT_DEFAULT_SDK} MATCHES "MacOSX[.0-9]+\.sdk")
+ get_filename_component(OSX_SYSROOT_DEFAULT_SDK ${OSX_SYSROOT_DEFAULT_SDK} DIRECTORY)
+ set (OSX_SYSROOT_DEFAULT_SDK ${OSX_SYSROOT_DEFAULT_SDK}/MacOSX.sdk/)
+ endif()
+
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/cling-compiledata.h.in
"
- #define CLING_OSX_SYSROOT \"${CMAKE_OSX_SYSROOT}\"
+ #define CLING_OSX_SYSROOT \"${OSX_SYSROOT_DEFAULT_SDK}\"
")
endif()
if (CLING_CXX_PATH)
--
GitLab