Use libstdc++-raw-cxx.m4 in libjava

Andreas Schwab schwab@linux-m68k.org
Thu Jan 3 18:09:00 GMT 2013


"H.J. Lu" <hjl.tools@gmail.com> writes:

> diff --git a/libjava/Makefile.am b/libjava/Makefile.am
> index c6c84e4..dd08a4f 100644
> --- a/libjava/Makefile.am
> +++ b/libjava/Makefile.am
> @@ -594,7 +594,7 @@ lib_gnu_awt_xlib_la_CPPFLAGS = \
>  	$(AM_CPPFLAGS) \
>  	$(LIBSTDCXX_RAW_CXX_CXXFLAGS)
>  ## The mysterious backslash in the grep pattern is consumed by make.
> -lib_gnu_awt_xlib_la_LDFLAGS = $(LIBSTDCXX_RAW_CXX_LDLAGS) \
> +lib_gnu_awt_xlib_la_LDFLAGS = $(LIBSTDCXX_RAW_CXX_LIBADD) \
>  	@X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
>          -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \
>          -version-info `grep -v '^\#' $(srcdir)/libtool-version`
> $(LIBGCJ_LD_SYMBOLIC)

It is still wrong to use LDFLAGS for libraries to be linked in.
All of $(LIBSTDCXX_RAW_CXX_LIBADD) @X_PRE_LIBS@ @X_LIBS@ -lX11
@X_EXTRA_LIBS@ should be on lib_gnu_awt_xlib_la_LDADD.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."



More information about the Gcc-patches mailing list