aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2002-03-31 09:33:05 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2002-03-31 09:33:05 +0000
commitb56bc85a40b31394439c3a29ddaf71f17654b83d (patch)
treebad3ec13807f5f0e1d4ee7d45f2b1fd4c5111fa8
parent1a0a7539e5f1eb980dd08c399290ca7ea3f6460b (diff)
downloadgcc-b56bc85a40b31394439c3a29ddaf71f17654b83d.zip
gcc-b56bc85a40b31394439c3a29ddaf71f17654b83d.tar.gz
gcc-b56bc85a40b31394439c3a29ddaf71f17654b83d.tar.bz2
libgcj.spec.in: Override libgcc, not lib.
* libgcj.spec.in: Override libgcc, not lib. * libgcj-test.spec.in: Likewise. From-SVN: r51640
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/libgcj-test.spec.in4
-rw-r--r--libjava/libgcj.spec.in4
3 files changed, 9 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8a79daa..eb81010 100644
--- 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 17816e2..5a4ab8c 100644
--- 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 e1b3526..a518b51 100644
--- 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