libgcj.spec.in: Override libgcc, not lib.

* libgcj.spec.in: Override libgcc, not lib.
* libgcj-test.spec.in: Likewise.

From-SVN: r51640

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8a79daac60c519f2c080d23f3d50098dfae37222..eb81010c8717a0a330a4f71ec008adb9859ce228 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-31  Alexandre Oliva  <aoliva@redhat.com>
+
+       * libgcj.spec.in: Override libgcc, not lib.
+       * libgcj-test.spec.in: Likewise.
+
 2002-03-29  Tom Tromey  <tromey@redhat.com>
 
        * java/net/natPlainDatagramSocketImpl.cc (close): New function.

diff --git a/libjava/libgcj-test.spec.in b/libjava/libgcj-test.spec.in
index 17816e26442bbf215fb38f162adec6b97c6fbaa0..5a4ab8c47c3efa9cffc99da5c6193aab93b431d1 100644 (file)
--- a/libjava/libgcj-test.spec.in
+++ b/libjava/libgcj-test.spec.in
@@ -2,6 +2,6 @@
 # This spec file is read by gcj when linking.
 # It is only used by the testing harnesses (in libjava and gdb).
 #
-%rename lib liborig2
-*lib: @LIBGCJTESTSPEC@ @GCTESTSPEC@ @ZLIBTESTSPEC@ %(liborig2)
+%rename libgcc libgccorig2
+*libgcc: @LIBGCJTESTSPEC@ @GCTESTSPEC@ @ZLIBTESTSPEC@ %(libgccorig2)
 

diff --git a/libjava/libgcj.spec.in b/libjava/libgcj.spec.in
index e1b3526f9cb591d778e968816d2a00a4390af0e5..a518b51c6b3875eb4310fdeaeb796ae7efe736c8 100644 (file)
--- a/libjava/libgcj.spec.in
+++ b/libjava/libgcj.spec.in
@@ -3,7 +3,7 @@
 # It is used to specify the standard libraries we need in order
 # to link with libgcj.
 #
-%rename lib liborig
-*lib: -lgcj -lm @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) %(liborig)
+%rename libgcc libgccorig
+*libgcc: -lgcj -lm @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgccorig)
 
 *jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ -fkeep-inline-functions