Skip to content

[cling] Remove hardcoded CLING_OSX_SYSROOT #21393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
vepadulano wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[cling] Remove hardcoded CLING_OSX_SYSROOT #21393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions interpreter/cling/lib/Interpreter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,25 +317,6 @@ if (UNIX)
#define CLING_CXX_INCL \"${CLING_CXX_HEADERS}\"
#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 \"${OSX_SYSROOT_DEFAULT_SDK}\"
")
endif()
if (CLING_CXX_PATH)
MESSAGE(STATUS "And if not found, will invoke: '${CLING_CXX_PATH}' for them.")
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/cling-compiledata.h.in
Expand Down
Loading