diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-01-06 19:21:07 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-01-06 19:21:07 +0000 |
| commit | 722067e3520cbe08b96ef5f18ef62b253ae8b483 (patch) | |
| tree | bb398498b7d1ee654946dcc917a38f2682584376 /debian/rules2 | |
| parent | 02c04623ed52aaec8f4281ce406c6611debdad9e (diff) | |
| download | gcc-48-722067e3520cbe08b96ef5f18ef62b253ae8b483.tar.gz | |
* Let gjdoc accept -source 1.5|1.6|1.7. Addresses: #678945.
* Fix build configured with --enable-java-maintainer-mode.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@6532 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules2')
| -rw-r--r-- | debian/rules2 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/rules2 b/debian/rules2 index f7a3877..d0cbedb 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -1032,13 +1032,13 @@ else ifeq ($(with_java_maintainer_mode),yes) ( \ echo '#!/bin/sh'; \ - echo 'exec gij-4.3 -cp /usr/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.GCCMain "$$@"'; \ + echo 'exec gij-4.8 -cp /usr/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.GCCMain "$$@"'; \ ) > bin/ecj1 chmod +x bin/ecj1 : # If we don't have gjavah in PATH, try to build it with the old gij mkdir -p bin - if [ -x /usr/bin/gjavah-4.3 ]; then \ - ln -sf /usr/bin/gjavah-4.3 bin/gjavah; \ + if [ -x /usr/bin/gjavah-4.8 ]; then \ + ln -sf /usr/bin/gjavah-4.8 bin/gjavah; \ elif [ -x bin/gjavah ]; then \ : ; \ else \ @@ -1048,13 +1048,13 @@ else mkdir -p gnu/classpath/tools; \ cp -a $(srcdir)/libjava/classpath/tools/gnu/classpath/tools/{common,javah,getopt} \ gnu/classpath/tools/; \ - cp -a $(srcdir)/libjava/classpath/resource/gnu/classpath/tools/common/Messages.properties \ + cp -a $(srcdir)/libjava/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties \ gnu/classpath/tools/common; \ cd external/asm; \ - for i in `find . -name \*.java`; do gcj-4.3 --encoding ISO-8859-1 -C $$i -I.; done; \ + for i in `find . -name \*.java`; do gcj-4.8 --encoding ISO-8859-1 -C $$i -I.; done; \ cd ../..; \ - for i in `find gnu -name \*.java`; do gcj-4.3 -C $$i -I. -Iexternal/asm/; done; \ - gcj-4.3 -findirect-dispatch -O2 -fmain=gnu.classpath.tools.javah.Main \ + for i in `find gnu -name \*.java`; do gcj-4.8 -C $$i -I. -Iexternal/asm/; done; \ + gcj-4.8 -findirect-dispatch -O2 -fmain=gnu.classpath.tools.javah.Main \ -I. -Iexternal/asm/ `find . -name \*.class` -o $(PWD)/bin/gjavah.real; \ ( \ echo '#!/bin/sh'; \ |