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

Jdk8 mac xcode restore after cross compiling on arm64 with Xcode-11.7 #3873

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Jdk8 mac xcode restore after cross compiling on arm64 with Xcode-11.7 #3873

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48b6902
Restore jdk8u mac x64 to original Xcode.app after build
andrew-m-leonard Jul 2, 2024
91fc45b
Restore jdk8u mac x64 to original Xcode.app after build
andrew-m-leonard Jul 2, 2024
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
7 changes: 7 additions & 0 deletions build-farm/make-adopt-build-farm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,13 @@ CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM//\"/temporary
# shellcheck disable=SC2086
bash -c "$MAC_ROSETTA_PREFIX $PLATFORM_SCRIPT_DIR/../makejdk-any-platform.sh --clean-git-repo --jdk-boot-dir ${JDK_BOOT_DIR} --configure-args \"${CONFIGURE_ARGS_FOR_ANY_PLATFORM}\" --target-file-name ${FILENAME} ${TAG_OPTION} ${OPTIONS} ${BUILD_ARGS} ${VARIANT_ARG} ${JAVA_TO_BUILD}"

# If this is jdk8u on mac x64 that has cross compiled on arm64 we need to restore Xcode from the Xcode-11.7.app to default
if [[ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ]] && [[ -n "$MAC_ROSETTA_PREFIX" ]]; then
echo "Restoring Xcode select to /"
echo "[WARNING] You may be asked for your su user password, attempting to switch Xcode version to /"
sudo xcode-select --switch /
fi

if [ -d "${WORKSPACE}" ]; then
SPACEUSED=$(du -sk "$WORKSPACE")
echo "Total disk space in Kb consumed by build process: $SPACEUSED"
Expand Down
Loading