diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-26 15:12:21 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-26 15:12:21 +0000 |
| commit | c497beb153363d1cd97b728f3896c12e9ec4979f (patch) | |
| tree | 6e501f231873029758d18c25d68e2f23a1041f4d /libjava | |
| parent | 9dc37dac32182ec6d28311ac581e480cb1c100ec (diff) | |
| download | ppe42-gcc-c497beb153363d1cd97b728f3896c12e9ec4979f.tar.gz ppe42-gcc-c497beb153363d1cd97b728f3896c12e9ec4979f.zip | |
* Makefile.in: Rebuilt.
* Makefile.am (jv_convert_LDFLAGS): Added -nodefaultlibs.
(jv_convert_LDADD): Explicltly add -lm -lc.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26653 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 11 | ||||
| -rw-r--r-- | libjava/Makefile.in | 10 |
3 files changed, 21 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a0507e5f635..b320d0ce551 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 1999-04-26 Tom Tromey <tromey@cygnus.com> + * Makefile.in: Rebuilt. + * Makefile.am (jv_convert_LDFLAGS): Added -nodefaultlibs. + (jv_convert_LDADD): Explicltly add -lm -lc. + +1999-04-26 Tom Tromey <tromey@cygnus.com> + * configure, Makefile.in: Rebuilt. * configure.in: Added AM_PROG_LIBTOOL. (GCOBJS): Use `.lo' form of files. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 02a7c7b0150..3e88f1973c0 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -251,10 +251,15 @@ CONVERT_DIR = gnu/gcj/convert jv_convert_SOURCES = EXTRA_jv_convert_SOURCES = $(convert_source_files) -jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert -rpath $(toolexeclibdir) -jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) -o jv-convert +## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We +## need this because we are explicitly using libtool to link using the +## `.la' file. +jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert -nodefaultlibs \ + -rpath $(toolexeclibdir) +jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \ + -o jv-convert jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ - $(GCLIBS) $(THREADLIBS) + $(GCLIBS) $(THREADLIBS) -lm -lc jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ $(GCDEPS) $(THREADDEPS) libgcj.la diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 4dd65b6c12e..6fb9cffba98 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -182,10 +182,14 @@ CONVERT_DIR = gnu/gcj/convert jv_convert_SOURCES = EXTRA_jv_convert_SOURCES = $(convert_source_files) -jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert -rpath $(toolexeclibdir) -jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) -o jv-convert +jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert -nodefaultlibs \ + -rpath $(toolexeclibdir) + +jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \ + -o jv-convert + jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ - $(GCLIBS) $(THREADLIBS) + $(GCLIBS) $(THREADLIBS) -lm -lc jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ $(GCDEPS) $(THREADDEPS) libgcj.la |
