diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2004-09-04 03:30:12 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2004-09-04 04:30:12 +0100 |
| commit | 351cfd8b8da5b9e80a488b6a24766371ebbe602d (patch) | |
| tree | b26ac7afee609fdac1e21c2c2ddfbc324b49287e /libjava/Makefile.am | |
| parent | 40923b202de784a0554d6a084464da3c1be4d976 (diff) | |
| download | gcc-351cfd8b8da5b9e80a488b6a24766371ebbe602d.tar.gz gcc-351cfd8b8da5b9e80a488b6a24766371ebbe602d.tar.bz2 gcc-351cfd8b8da5b9e80a488b6a24766371ebbe602d.zip | |
re PR libgcj/17290 (Wrong Java dependencies are generated)
2004-09-03 Bryce McKinlay <mckinlay@redhat.com>
H.J. Lu <hongjiu.lu@intel.com>
PR libgcj/17290
* Makefile.am (GCJCOMPILE): Remove definition.
(AM_CFLAGS): Add -fclasspath and -fbootclasspath flags.
Use LTGCJCOMPILE, not GCJCOMPILE, to build .lo targets.
* Makefile.in: Rebuilt.
Co-Authored-By: H.J. Lu <hongjiu.lu@intel.com>
From-SVN: r87074
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index cc80edbed5e..a959c4c2b04 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -137,7 +137,6 @@ ZIP = @ZIP@ ## compiles. GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fclasspath= -fbootclasspath=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ @@ -170,6 +169,7 @@ AM_CXXFLAGS = \ AM_GCJFLAGS = \ @LIBGCJ_JAVAFLAGS@ \ + -fclasspath= -fbootclasspath=$(here) \ --encoding=UTF-8 \ -Wno-deprecated @@ -453,7 +453,7 @@ gnu/regexp/MessagesBundle_fr.properties propertyo_files = $(property_files:.properties=.properties.lo) %.properties.lo: %.properties - $(GCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"` + $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"` if ONESTEP @@ -519,16 +519,16 @@ SUFFIXES = .class .java .h .properties ## Note: we omit StackTrace here, since it has an explicit rule a bit ## later, and GNU make will warn in this case. $(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java - $(GCJCOMPILE) -o $@ $< + $(LTGCJCOMPILE) -o $@ -c $< $(gtk_awt_peer_sources:.java=.lo): %.lo: %.java - $(GCJCOMPILE) -fjni -o $@ $< + $(LTGCJCOMPILE) -fjni -o $@ -c $< ## A special case. The sibcall optimization can change the number of ## frames on the stack, and StackTrace makes assumptions about this ## number. gnu/gcj/runtime/StackTrace.lo: gnu/gcj/runtime/StackTrace.java - $(GCJCOMPILE) -fno-optimize-sibling-calls -o $@ $< + $(LTGCJCOMPILE) -fno-optimize-sibling-calls -o $@ -c $< lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES) @echo Creating list of files to link... |