Mercurial > hg > release > icedtea7-2.0
view patches/boot/compile-for-7.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 | |
| children |
line wrap: on
line source
diff -r f7e8b10f51c6 make/linux/makefiles/rules.make --- openjdk-boot/hotspot/make/linux/makefiles/rules.make Tue Jun 28 00:25:25 2011 +0100 +++ openjdk-boot/hotspot/make/linux/makefiles/rules.make Tue Jul 05 11:59:08 2011 +0100 @@ -139,8 +139,8 @@ RUN.JAR$(MAKE_VERBOSE) += >/dev/null # Settings for javac -BOOT_SOURCE_LANGUAGE_VERSION = 6 -BOOT_TARGET_CLASS_VERSION = 6 +BOOT_SOURCE_LANGUAGE_VERSION = 7 +BOOT_TARGET_CLASS_VERSION = 7 JAVAC_FLAGS = -g -encoding ascii BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) diff -r f7e8b10f51c6 make/solaris/makefiles/rules.make --- openjdk-boot/hotspot/make/solaris/makefiles/rules.make Tue Jun 28 00:25:25 2011 +0100 +++ openjdk-boot/hotspot/make/solaris/makefiles/rules.make Tue Jul 05 11:59:08 2011 +0100 @@ -131,8 +131,8 @@ RUN.JAR$(MAKE_VERBOSE) += >/dev/null # Settings for javac -BOOT_SOURCE_LANGUAGE_VERSION = 6 -BOOT_TARGET_CLASS_VERSION = 6 +BOOT_SOURCE_LANGUAGE_VERSION = 7 +BOOT_TARGET_CLASS_VERSION = 7 JAVAC_FLAGS = -g -encoding ascii BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) diff -r f7e8b10f51c6 make/windows/makefiles/rules.make --- openjdk-boot/hotspot/make/windows/makefiles/rules.make Tue Jun 28 00:25:25 2011 +0100 +++ openjdk-boot/hotspot/make/windows/makefiles/rules.make Tue Jul 05 11:59:08 2011 +0100 @@ -43,8 +43,8 @@ !endif # Settings for javac -BOOT_SOURCE_LANGUAGE_VERSION=6 -BOOT_TARGET_CLASS_VERSION=6 +BOOT_SOURCE_LANGUAGE_VERSION=7 +BOOT_TARGET_CLASS_VERSION=7 JAVAC_FLAGS=-g -encoding ascii BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)