Skip to content

Commit d2fb307

Browse files
committed
8219986: Change to Xcode 10.1 for building on Macosx at Oracle
Reviewed-by: mdoerr Backport-of: 53adab6
1 parent fd22289 commit d2fb307

File tree

3 files changed

+5
-168
lines changed

3 files changed

+5
-168
lines changed

make/conf/jib-profiles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ var getJibProfilesDependencies = function (input, common) {
854854

855855
var devkit_platform_revisions = {
856856
linux_x64: "gcc7.3.0-OEL6.4+1.1",
857-
macosx_x64: "Xcode9.4-MacOSX10.13+1.0",
857+
macosx_x64: "Xcode10.1-MacOSX10.14+1.0",
858858
solaris_x64: "SS12u4-Solaris11u1+1.0",
859859
solaris_sparcv9: "SS12u4-Solaris11u1+1.1",
860860
windows_x64: "VS2017-15.9.16+1.0",
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -48,16 +48,14 @@ BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
4848
# Find the version of Xcode
4949
XCODE_VERSION="$($XCODE_APP/Contents/Developer/usr/bin/xcodebuild -version \
5050
| awk '/Xcode/ { print $2 }' )"
51-
SDK_VERSION="MacOSX10.13"
52-
if [ ! -e "$XCODE_APP/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/${SDK_VERSION}.sdk" ]; then
53-
echo "Expected SDK version not found: ${SDK_VERSION}"
54-
exit 1
55-
fi
51+
SDK_VERSION="$(ls $XCODE_APP/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs \
52+
| grep [0-9] | sort -r | head -n1 | sed 's/\.sdk//')"
5653

5754
DEVKIT_ROOT="${BUILD_DIR}/Xcode${XCODE_VERSION}-${SDK_VERSION}"
5855
DEVKIT_BUNDLE="${DEVKIT_ROOT}.tar.gz"
5956

6057
echo "Xcode version: $XCODE_VERSION"
58+
echo "SDK version: $SDK_VERSION"
6159
echo "Creating devkit in $DEVKIT_ROOT"
6260

6361
mkdir -p $DEVKIT_ROOT

make/devkit/createMacosxDevkit6.sh

Lines changed: 0 additions & 161 deletions
This file was deleted.

0 commit comments

Comments
 (0)