stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8317560: Change to Xcode 14.3.1 for building on macOS at Oracle

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Mikael Vidstedt 2023-10-06 16:11:58 +00:00
parent b3cc0c8431
commit a64794b1ed
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/building.html
View File

@ -367,7 +367,7 @@ to date at the time of writing.</p>
</tr> </tr>
<tr class="even"> <tr class="even">
<td>macOS</td> <td>macOS</td>
<td>Mac OS X 10.13 (High Sierra)</td> <td>macOS 13 (Ventura)</td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<td>Windows</td> <td>Windows</td>
@ -464,9 +464,8 @@ this makes it difficult for a project such as the JDK to keep pace with
a continuously updated machine running macOS. See the section on <a a continuously updated machine running macOS. See the section on <a
href="#apple-xcode">Apple Xcode</a> on some strategies to deal with href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
this.</p> this.</p>
<p>It is recommended that you use at least Mac OS X 10.13 (High Sierra). <p>It is recommended that you use at least macOS 13 (Ventura) and Xcode
At the time of writing, the JDK has been successfully compiled on macOS 14, but earlier versions may also work.</p>
10.12 (Sierra).</p>
<p>The standard macOS environment contains the basic tooling needed to <p>The standard macOS environment contains the basic tooling needed to
build, but for external libraries a package manager is recommended. The build, but for external libraries a package manager is recommended. The
JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
@ -545,7 +544,7 @@ to compile successfully without issues.</p>
</tr> </tr>
<tr class="even"> <tr class="even">
<td>macOS</td> <td>macOS</td>
<td>Apple Xcode 10.1 (using clang 10.0.0)</td> <td>Apple Xcode 14.3.1 (using clang 14.0.3)</td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<td>Windows</td> <td>Windows</td>

8
doc/building.md
View File

@ -167,7 +167,7 @@ time of writing.
| Operating system | Vendor/version used | | Operating system | Vendor/version used |
| ----------------- | ---------------------------------- | | ----------------- | ---------------------------------- |
| Linux | Oracle Enterprise Linux 6.4 / 7.6 | | Linux | Oracle Enterprise Linux 6.4 / 7.6 |
| macOS | Mac OS X 10.13 (High Sierra) | | macOS | macOS 13 (Ventura) |
| Windows | Windows Server 2012 R2 | | Windows | Windows Server 2012 R2 |
The double version numbers for Linux are due to the hybrid model The double version numbers for Linux are due to the hybrid model
@ -270,8 +270,8 @@ difficult for a project such as the JDK to keep pace with a continuously updated
machine running macOS. See the section on [Apple Xcode](#apple-xcode) on some machine running macOS. See the section on [Apple Xcode](#apple-xcode) on some
strategies to deal with this. strategies to deal with this.
It is recommended that you use at least Mac OS X 10.13 (High Sierra). At the time It is recommended that you use at least macOS 13 (Ventura) and Xcode
of writing, the JDK has been successfully compiled on macOS 10.12 (Sierra). 14, but earlier versions may also work.
The standard macOS environment contains the basic tooling needed to build, but The standard macOS environment contains the basic tooling needed to build, but
for external libraries a package manager is recommended. The JDK uses for external libraries a package manager is recommended. The JDK uses
@ -337,7 +337,7 @@ issues.
| Operating system | Toolchain version | | Operating system | Toolchain version |
| ------------------ | ------------------------------------------ | | ------------------ | ------------------------------------------ |
| Linux | gcc 11.2.0 | | Linux | gcc 11.2.0 |
| macOS | Apple Xcode 10.1 (using clang 10.0.0) | | macOS | Apple Xcode 14.3.1 (using clang 14.0.3) |
| Windows | Microsoft Visual Studio 2022 update 17.1.0 | | Windows | Microsoft Visual Studio 2022 update 17.1.0 |
All compilers are expected to be able to compile to the C99 language standard, All compilers are expected to be able to compile to the C99 language standard,

2
make/conf/jib-profiles.js
View File

@ -1081,7 +1081,7 @@ var getJibProfilesDependencies = function (input, common) {
var devkit_platform_revisions = { var devkit_platform_revisions = {
linux_x64: "gcc11.2.0-OL6.4+1.0", linux_x64: "gcc11.2.0-OL6.4+1.0",
macosx: "Xcode12.4+1.1", macosx: "Xcode14.3.1+1.0",
windows_x64: "VS2022-17.1.0+1.1", windows_x64: "VS2022-17.1.0+1.1",
linux_aarch64: input.build_cpu == "x64" ? "gcc11.2.0-OL7.6+1.1" : "gcc11.2.0-OL7.6+1.0", linux_aarch64: input.build_cpu == "x64" ? "gcc11.2.0-OL7.6+1.1" : "gcc11.2.0-OL7.6+1.0",
linux_arm: "gcc8.2.0-Fedora27+1.0", linux_arm: "gcc8.2.0-Fedora27+1.0",

8
make/devkit/createMacosxDevkit.sh
View File

@ -106,8 +106,8 @@ for ex in $EXCLUDE_DIRS; do
done done
echo "Copying Xcode.app..." echo "Copying Xcode.app..."
echo rsync -rlH $INCLUDE_ARGS $EXCLUDE_ARGS "$XCODE_APP/." $DEVKIT_ROOT/Xcode.app/ echo rsync -rlH $INCLUDE_ARGS $EXCLUDE_ARGS "$XCODE_APP/." $DEVKIT_ROOT/Xcode
rsync -rlH $INCLUDE_ARGS $EXCLUDE_ARGS "$XCODE_APP/." $DEVKIT_ROOT/Xcode.app/ rsync -rlH $INCLUDE_ARGS $EXCLUDE_ARGS "$XCODE_APP/." $DEVKIT_ROOT/Xcode
################################################################################ ################################################################################
@ -119,8 +119,8 @@ echo "Generating devkit.info..."
rm -f $DEVKIT_ROOT/devkit.info rm -f $DEVKIT_ROOT/devkit.info
echo-info "# This file describes to configure how to interpret the contents of this devkit" echo-info "# This file describes to configure how to interpret the contents of this devkit"
echo-info "DEVKIT_NAME=\"Xcode $XCODE_VERSION (devkit)\"" echo-info "DEVKIT_NAME=\"Xcode $XCODE_VERSION (devkit)\""
echo-info "DEVKIT_TOOLCHAIN_PATH=\"\$DEVKIT_ROOT/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin:\$DEVKIT_ROOT/Xcode.app/Contents/Developer/usr/bin\"" echo-info "DEVKIT_TOOLCHAIN_PATH=\"\$DEVKIT_ROOT/Xcode/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin:\$DEVKIT_ROOT/Xcode/Contents/Developer/usr/bin\""
echo-info "DEVKIT_SYSROOT=\"\$DEVKIT_ROOT/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/$SDK_VERSION.sdk\"" echo-info "DEVKIT_SYSROOT=\"\$DEVKIT_ROOT/Xcode/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/$SDK_VERSION.sdk\""
echo-info "DEVKIT_EXTRA_PATH=\"\$DEVKIT_TOOLCHAIN_PATH\"" echo-info "DEVKIT_EXTRA_PATH=\"\$DEVKIT_TOOLCHAIN_PATH\""
################################################################################ ################################################################################