Mercurial > hg > release > icedtea8-3.0
changeset 2354:af3ba972e863
Use OpenJDK source files over OpenJDK6 classes in rt.jar.
2010-12-08 Andrew John Hughes <ahughes@redhat.com>
* javac.in:
Pass -Xprefer:source (if javac is used) to
pick up local OpenJDK7 versions of classes
prior to those in OpenJDK6.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 08 Dec 2010 18:52:17 +0000 |
| parents | 44d809890734 |
| children | b363caf51669 |
| files | ChangeLog javac.in |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Nov 30 16:31:02 2010 +0100 +++ b/ChangeLog Wed Dec 08 18:52:17 2010 +0000 @@ -1,3 +1,10 @@ +2010-12-08 Andrew John Hughes <ahughes@redhat.com> + + * javac.in: + Pass -Xprefer:source (if javac is used) to + pick up local OpenJDK7 versions of classes + prior to those in OpenJDK6. + 2010-11-30 Matthias Klose <doko@ubuntu.com> * patches/icedtea-hotspot-6b11-7b24.patch: Remove.
--- a/javac.in Tue Nov 30 16:31:02 2010 +0100 +++ b/javac.in Wed Dec 08 18:52:17 2010 +0000 @@ -20,6 +20,7 @@ push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar' unless grep {$_ eq '-bootclasspath'} @ARGV; my @ecj_parms = ($ECJ_WARNINGS, @bcoption); +my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source') # Work around ecj's inability to handle duplicate command-line # options and unknown javac options. @@ -59,7 +60,7 @@ } else { - exec '@JAVAC@', $JAVAC_WARNINGS, @ARGV ; + exec '@JAVAC@', @javac_parms, @ARGV ; } } else