changeset 1289:5e90096ee2b2

8059003: Oracle JCE build environment: Phase 3 Reviewed-by: mullan, alanb, erikj, mchung
author wetmore
date Thu, 13 Nov 2014 13:25:14 -0800
parents 797108a96da5
children e2a76dfcf308
files common/autoconf/generated-configure.sh make/Main.gmk make/common/SetupJavaCompilers.gmk
diffstat 3 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Thu Nov 13 16:15:56 2014 +0100
+++ b/common/autoconf/generated-configure.sh	Thu Nov 13 13:25:14 2014 -0800
@@ -4328,7 +4328,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1415890669
+DATE_WHEN_GENERATED=1415912524
 
 ###############################################################################
 #
--- a/make/Main.gmk	Thu Nov 13 16:15:56 2014 +0100
+++ b/make/Main.gmk	Thu Nov 13 13:25:14 2014 -0800
@@ -445,7 +445,7 @@
 # alias for ease of use.
 jdk: exploded-image
 
-jars: main-jars nashorn-jar security-jars
+jars: main-jars nashorn-jar
 
 images: jimages demos samples sec-bin
 
--- a/make/common/SetupJavaCompilers.gmk	Thu Nov 13 16:15:56 2014 +0100
+++ b/make/common/SetupJavaCompilers.gmk	Thu Nov 13 13:25:14 2014 -0800
@@ -61,8 +61,7 @@
     JVM := $(JAVA), \
     JAVAC := $(NEW_JAVAC), \
     FLAGS := -source 9 -target 9 \
-        -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS) \
-        $(GENERATE_JDKBYTECODE_EXTRA_FLAGS), \
+        -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
 
@@ -72,8 +71,7 @@
     JVM := $(JAVA), \
     JAVAC := $(NEW_JAVAC), \
     FLAGS := -source 9 -target 9 \
-        -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS) \
-        $(GENERATE_JDKBYTECODE_EXTRA_FLAGS), \
+        -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))