Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8139735: Switch compilers in JPRT for windows and linux
authorerikj
Tue, 20 Oct 2015 09:47:56 +0200
changeset 33029 06a8c5e5959b
parent 33028 5520ed52f1c7
child 33030 de12d9a875ed
8139735: Switch compilers in JPRT for windows and linux Reviewed-by: tbell, ihse
make/devkit/Tools.gmk file | annotate | diff | comparison | revisions
make/devkit/createWindowsDevkit.sh file | annotate | diff | comparison | revisions
make/jprt.properties file | annotate | diff | comparison | revisions 
--- a/make/devkit/Tools.gmk	Mon Oct 19 19:13:58 2015 +0200
+++ b/make/devkit/Tools.gmk	Tue Oct 20 09:47:56 2015 +0200
@@ -49,9 +49,9 @@
 # Define external dependencies
 
 # Latest that could be made to work.
-gcc_ver := gcc-4.8.2
-binutils_ver := binutils-2.24
-ccache_ver := ccache-3.1.9
+gcc_ver := gcc-4.9.2
+binutils_ver := binutils-2.25
+ccache_ver := ccache-3.2.1
 mpfr_ver := mpfr-3.0.1
 gmp_ver := gmp-4.3.2
 mpc_ver := mpc-1.0.1
--- a/make/devkit/createWindowsDevkit.sh	Mon Oct 19 19:13:58 2015 +0200
+++ b/make/devkit/createWindowsDevkit.sh	Tue Oct 20 09:47:56 2015 +0200
@@ -32,10 +32,11 @@
 VS_VERSION_NUM="12.0"
 VS_VERSION_NUM_NODOT="120"
 SDK_VERSION="8.1"
+VS_VERSION_SP="SP4"
 
 SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
 BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
-DEVKIT_ROOT="${BUILD_DIR}/VS${VS_VERSION}-devkit"
+DEVKIT_ROOT="${BUILD_DIR}/VS${VS_VERSION}${VS_VERSION_SP}-devkit"
 DEVKIT_BUNDLE="${DEVKIT_ROOT}.tar.gz"
 
 echo "Creating devkit in $DEVKIT_ROOT"
@@ -103,7 +104,7 @@
 echo "Generating 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 "DEVKIT_NAME=\"Microsoft Visual Studio $VS_VERSION (devkit)\""
+echo-info "DEVKIT_NAME=\"Microsoft Visual Studio $VS_VERSION $VS_VERSION_SP (devkit)\""
 echo-info "DEVKIT_VS_VERSION=\"$VS_VERSION\""
 echo-info ""
 echo-info "DEVKIT_TOOLCHAIN_PATH_x86=\"\$DEVKIT_ROOT/VC/bin:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
--- a/make/jprt.properties	Mon Oct 19 19:13:58 2015 +0200
+++ b/make/jprt.properties	Tue Oct 20 09:47:56 2015 +0200
@@ -122,11 +122,16 @@
 jprt.i586.productOpen.build.configure.args=				\
     ${my.i586.default.build.configure.args}				\
     ${jprt.productOpen.build.configure.args}
+jprt.linux_i586.build.configure.args=					\
+    --with-devkit=$GCC492_OEL64_HOME					\
+    ${jprt.i586.build.configure.args}
+jprt.linux_x64.build.configure.args=					\
+    --with-devkit=$GCC492_OEL64_HOME
 jprt.windows_i586.build.configure.args=					\
-    --with-devkit=$VS2013_HOME						\
+    --with-devkit=$VS2013SP4_HOME					\
     ${jprt.i586.build.configure.args}
 jprt.windows_x64.build.configure.args=					\
-    --with-devkit=$VS2013_HOME
+    --with-devkit=$VS2013SP4_HOME
 
 ########
 #
jdk-sandbox