Skip to content
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

[6.4.0] Revert "Switch xcode_autoconf to use 'configure = True' (#19174)" #19550

Merged
merged 1 commit into from
Sep 18, 2023
Merged

[6.4.0] Revert "Switch xcode_autoconf to use 'configure = True' (#19174)" #19550

Show file tree
Hide file tree
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
20 changes: 10 additions & 10 deletions src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,11 @@ private static Map.Entry<XcodeVersionRuleData, Availability> resolveXcodeFromLoc
} else if (specifiedVersionFromRemote != null) {
ruleContext.ruleWarning(
String.format(
"--xcode_version=%1$s specified, but it is not available locally. Your build will"
+ " fail if any actions require a local Xcode. If you believe you have '%1$s'"
+ " installed, try running \"blaze sync --configure\", and then re-run your"
+ " command. localy available versions: [%2$s]. remotely available versions:"
+ " [%3$s]",
"--xcode_version=%1$s specified, but it is not available locally. Your build"
+ " will fail if any actions require a local Xcode. If you believe you have"
+ " '%1$s' installed, try running \"blaze shutdown\", and then re-run your"
+ " command. localy available versions: [%2$s]. remotely available"
+ " versions: [%3$s]",
versionOverrideFlag,
printableXcodeVersions(localVersions.getAvailableVersions()),
printableXcodeVersions(remoteVersions.getAvailableVersions())));
Expand All @@ -418,7 +418,7 @@ private static Map.Entry<XcodeVersionRuleData, Availability> resolveXcodeFromLoc
"--xcode_version=%1$s specified, but '%1$s' is not an available Xcode version."
+ " localy available versions: [%2$s]. remotely available versions:"
+ " [%3$s]. If you believe you have '%1$s' installed, try running \"blaze"
+ " sync --configure\", and then re-run your command.",
+ " shutdown\", and then re-run your command.",
versionOverrideFlag,
printableXcodeVersions(localVersions.getAvailableVersions()),
printableXcodeVersions(remoteVersions.getAvailableVersions())));
Expand Down Expand Up @@ -472,10 +472,10 @@ private static Map.Entry<XcodeVersionRuleData, Availability> resolveXcodeFromLoc
checkState(defaultVersion != null);
return Maps.immutableEntry(defaultVersion, Availability.BOTH);
} else { // Use the local default.
ruleContext.ruleWarning(
"You passed --experimental_prefer_mutual_xcode=false, which prevents Bazel from"
+ " selecting an Xcode version that optimizes your performance. Please consider"
+ " using --experimental_prefer_mutual_xcode=true.");
ruleContext.ruleWarning(
"You passed --experimental_prefer_mutual_xcode=false, which prevents Bazel from"
+ " selecting an Xcode version that optimizes your performance. Please consider"
+ " using --experimental_prefer_mutual_xcode=true.");
return Maps.immutableEntry(localVersions.getDefaultVersion(), Availability.LOCAL);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tools/osx/xcode_configure.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ xcode_autoconf = repository_rule(
"XCODE_VERSION",
],
implementation = _impl,
configure = True,
local = True,
attrs = {
"xcode_locator": attr.string(),
"remote_xcode": attr.string(),
Expand Down