changeset 1291:e347139b6cc3

Minor fixes from code review
author erikj
date Fri, 14 Nov 2014 12:32:35 +0100
parents e2a76dfcf308
children 1040c124008e
files common/autoconf/bootcycle-spec.gmk.in make/Images.gmk make/Main.gmk make/ZipSource.gmk make/common/NativeCompilation.gmk
diffstat 5 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/bootcycle-spec.gmk.in	Fri Nov 14 12:32:19 2014 +0100
+++ b/common/autoconf/bootcycle-spec.gmk.in	Fri Nov 14 12:32:35 2014 +0100
@@ -50,6 +50,7 @@
 
 # The bootcycle build has a different output directory
 BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build
+SJAVAC_SERVER_DIR:=$(subst @BUILD_OUTPUT@,$(BUILD_OUTPUT),$(SJAVAC_SERVER_DIR))
 
 JAVA_CMD:=$(BOOT_JDK)/bin/java
 JAVAC_CMD:=$(BOOT_JDK)/bin/javac
--- a/make/Images.gmk	Fri Nov 14 12:32:19 2014 +0100
+++ b/make/Images.gmk	Fri Nov 14 12:32:35 2014 +0100
@@ -37,7 +37,6 @@
 
 ############################################################################
 
-# Dropping jdk.deploy since it currently doesn't exist.
 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
                jdk.security.auth jdk.security.jgss jdk.runtime
 
--- a/make/Main.gmk	Fri Nov 14 12:32:19 2014 +0100
+++ b/make/Main.gmk	Fri Nov 14 12:32:35 2014 +0100
@@ -302,12 +302,12 @@
 ifneq ($(findstring -only, $(MAKECMDGOALS)), )
   .NOTPARALLEL:
 else
+  $(LANGTOOLS_GENSRC_TARGETS): buildtools-langtools
+
   interim-langtools: $(LANGTOOLS_GENSRC_TARGETS)
 
   buildtools-jdk: interim-langtools
 
-  $(LANGTOOLS_GENSRC_TARGETS): buildtools-langtools
-
   $(CORBA_GENSRC_TARGETS): interim-langtools
 
   $(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
@@ -420,9 +420,6 @@
 
 launchers: $(LAUNCHER_TARGETS)
 
-# Explicitly add dependencies for these special targets
-java.base: import-hotspot
-
 # Explicitly declare dependency for virtual target jdk.jdwp.agent-gensrc which
 # is actually handled by jdk.jdi-gensrc
 jdk.jdwp.agent-gensrc: jdk.jdi-gensrc
--- a/make/ZipSource.gmk	Fri Nov 14 12:32:19 2014 +0100
+++ b/make/ZipSource.gmk	Fri Nov 14 12:32:35 2014 +0100
@@ -34,6 +34,7 @@
 
 ################################################################################
 
+# Use ?= to enable override in custom makefile
 SRC_ZIP_INCLUDES ?= \
     com \
     java \
--- a/make/common/NativeCompilation.gmk	Fri Nov 14 12:32:19 2014 +0100
+++ b/make/common/NativeCompilation.gmk	Fri Nov 14 12:32:35 2014 +0100
@@ -520,12 +520,12 @@
 		$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$@ \
 		    $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
 		    $$($1_EXTRA_LDFLAGS_SUFFIX)
+		$$($1_CREATE_DEBUGINFO_CMDS)
                 # Touch target to make sure it has a later time stamp than the debug
                 # symbol files to avoid unnecessary relinking on rebuild.
                 ifeq ($(OPENJDK_TARGET_OS), windows)
 		  $(TOUCH) $$@
                 endif
-		$$($1_CREATE_DEBUGINFO_CMDS)
 
   endif
 
@@ -557,12 +557,12 @@
 		    $(CODESIGN) -s openjdk_codesign $$@
                   endif
                 endif
+		$$($1_CREATE_DEBUGINFO_CMDS)
                 # Touch target to make sure it has a later time stamp than the debug
                 # symbol files to avoid unnecessary relinking on rebuild.
                 ifeq ($(OPENJDK_TARGET_OS), windows)
 		  $(TOUCH) $$@
                 endif
-		$$($1_CREATE_DEBUGINFO_CMDS)
 
   endif
 endef