Skip to content

Commit bd97ae6

Browse files
author
ripley
committed
tweak for Xcode/CLT 26 on macOS
git-svn-id: https://svn.r-project.org/R/trunk@88385 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent d5c3109 commit bd97ae6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/library/tools/R/install.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2820,11 +2820,11 @@ if(FALSE) {
28202820
}
28212821
if (Sys.info()["sysname"] == "Darwin" &&
28222822
(with_c|| with_f77 || with_f9x || with_cxx)) {
2823-
## report the SDK in use: we want to know what it is symlinked to
2824-
sdk <- try(system2("xcrun", "--show-sdk-path", TRUE, TRUE), silent = TRUE)
2823+
## report the SDK in use: this changed at Xcode/CLT 26
2824+
sdk <- try(system2("xcrun", "--show-sdk-version", TRUE, TRUE), silent = TRUE)
28252825
if(!inherits(sdk, "try-error")) {
28262826
sdk <- if (length(attr(sdk, "status"))) NA_character_
2827-
else Sys.readlink(sdk)
2827+
else paste0("MacOSX", sdk, ".sdk")
28282828
message("using SDK: ", sQuote(sdk))
28292829
}
28302830
}

0 commit comments

Comments
 (0)