From 74c3eaa29a6785c02c9dcd08d54d1d81994dc19d Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Tue, 21 Apr 2020 13:26:15 +0100
Subject: [PATCH] bump jdk8u builds to macOS 10.14 (#1688)

---
 build-farm/platform-specific-configurations/mac.sh        | 4 ++--
 pipelines/jobs/configurations/jdk8_pipeline_config.groovy | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-farm/platform-specific-configurations/mac.sh b/build-farm/platform-specific-configurations/mac.sh
index 117418a04..7668e435a 100755
--- a/build-farm/platform-specific-configurations/mac.sh
+++ b/build-farm/platform-specific-configurations/mac.sh
@@ -36,6 +36,7 @@ XCODE_SWITCH_PATH="/";
 if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ]
 then
   XCODE_SWITCH_PATH="/Applications/Xcode.app"
+  export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-toolchain-type=clang"
   # See https://github.com/AdoptOpenJDK/openjdk-build/issues/1202
   if isHotSpot; then
     export COMPILER_WARNINGS_FATAL=false
@@ -111,7 +112,6 @@ if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then
   then
     export SED=gsed
     export TAR=gtar
-    export SDKPATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
-    export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-xcode-path=/Applications/Xcode.app --with-openj9-cc=/Applications/Xcode7/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang --with-openj9-cxx=/Applications/Xcode7/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ --with-openj9-developer-dir=/Applications/Xcode7/Xcode.app/Contents/Developer"
+    export SDKPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
   fi
 fi
diff --git a/pipelines/jobs/configurations/jdk8_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8_pipeline_config.groovy
index 965ffbd5e..21f3509a6 100644
--- a/pipelines/jobs/configurations/jdk8_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk8_pipeline_config.groovy
@@ -4,9 +4,9 @@ class Config8 {
                 os                  : 'mac',
                 arch                : 'x64',
                 additionalNodeLabels: [
-                        hotspot : 'build-macstadium-macos1010-1',
+                        hotspot : 'macos10.14',
                         corretto: 'build-macstadium-macos1010-1',
-                        openj9  : 'build-macstadium-macos1010-2'
+                        openj9  : 'macos10.14'
                 ],
                 test                : ['sanity.openjdk', 'sanity.system', 'extended.system', 'special.openjdk']
         ],
@@ -14,7 +14,7 @@ class Config8 {
         x64MacXL      : [
                 os                   : 'mac',
                 arch                 : 'x64',
-                additionalNodeLabels : 'build-macstadium-macos1010-2',
+                additionalNodeLabels : 'macos10.14',
                 test                 : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'special.openjdk'],
                 additionalFileNameTag: "macosXL",
                 configureArgs        : '--with-noncompressedrefs'