Mercurial > hg > release > icedtea7-2.0
view patches/boot/hotspot-jdk-dependency.patch @ 2450:91be8105cfa7
PR icedtea/751: Make IcedTea7 bootstrap IcedTea7
2011-07-05 Andrew John Hughes <ahughes@redhat.com>
PR icedtea/751
* Makefile.am:
(ICEDTEA_BOOT_PATCHES): Include compile-for-7
patch if javac supports diamond. This makes
the HotSpot build use source/target 7, allowing
it to compile the JDK code it depends on.
* javac.in: Add -XDignore.symbol.file=true
when using javac to avoid numerous proprietary
warnings.
* patches/boot/compile-for-7.patch:
Set SOURCE_LANGUAGE_VERSION/TARGET_CLASS_VERSION
use 7 in HotSpot instead of 6.
* patches/boot/hotspot-jdk-dependency.patch:
Include the *nix-specific code in solaris/classes.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 05 Jul 2011 13:48:51 +0100 |
| parents | 0811a305cdb3 |
| children |
line wrap: on
line source
diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make --- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2011-03-14 17:45:38.000000000 +0000 +++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2011-03-14 19:28:26.633153480 +0000 @@ -97,8 +97,8 @@ $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) - $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) - $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) + $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) + $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk --- openjdk-boot.orig/make/hotspot-rules.gmk 2011-03-14 19:26:01.289492705 +0000 +++ openjdk-boot/make/hotspot-rules.gmk 2011-03-14 19:26:34.640496978 +0000 @@ -83,6 +83,7 @@ HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS) HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR) HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH) +HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR) # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=? # Or is there something wrong with hotspot/make/Makefile?