diff options
author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-11 05:02:20 +0000 |
---|---|---|
committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-11 05:02:20 +0000 |
commit | fd5623f3c9125019eeed9530e4b5b7314eeb60b3 (patch) | |
tree | 51748ad36944437b6b00ce73b566297a528bc2cc /libstdc++-v3 | |
parent | d6516a1e4dc5fa9c8294d71afe4db8e8acc0e020 (diff) | |
download | gcc-fd5623f3c9125019eeed9530e4b5b7314eeb60b3.tar.gz |
Override all per-target *_LINK variables correctly.
boehm-gc/:
* Makefile.am (libgcjgc_la_LINK, gctest_LINK): New.
(gctest_LDADD): Depend on libgcjgc.la instead of ./libgcjgc.la,
so that library dependency resolution works with portable make.
* Makefile.in: Regenerate.
libgfortran/:
* Makefile.am (libgfortranbegin_la_LINK): New.
* Makefile.in: Regenerate.
libgomp/:
* Makefile.am (libgomp_la_LINK): New.
* Makefile.in: Regenerate.
libjava/:
* Makefile.am (libgij_la_LINK, libjvm_la_LINK): New.
* Makefile.in: Regenerate.
libstdc++-v3/:
* src/Makefile.am (libstdc___la_LINK): New.
* src/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151627 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/src/Makefile.am | 2 | ||||
-rw-r--r-- | libstdc++-v3/src/Makefile.in | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7f646a97526..0fc0a4f284a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2009-09-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * src/Makefile.am (libstdc___la_LINK): New. + * src/Makefile.in: Regenerate. + 2009-09-09 Loren J. Rittle <ljrittle@acm.org> * testsuite/30_threads/thread/native_handle/typesizes.cc: Remove diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 54d521825c4..9513bd52dbf 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -209,6 +209,8 @@ libstdc___la_DEPENDENCIES = \ libstdc___la_LDFLAGS = \ -version-info $(libtool_VERSION) ${version_arg} -lm +libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) + # Use special rules for the deprecated source files so that they find # deprecated include files. GLIBCXX_INCLUDE_DIR=$(glibcxx_builddir)/include diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index e484d86e130..9c03ac4dc78 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -129,9 +129,6 @@ am__objects_5 = atomic.lo bitmap_allocator.lo pool_allocator.lo \ thread.lo future.lo $(am__objects_1) $(am__objects_4) am_libstdc___la_OBJECTS = $(am__objects_5) libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS) -libstdc___la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libstdc___la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = am__depfiles_maybe = @@ -450,6 +447,7 @@ libstdc___la_DEPENDENCIES = \ libstdc___la_LDFLAGS = \ -version-info $(libtool_VERSION) ${version_arg} -lm +libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) # Use special rules for the deprecated source files so that they find # deprecated include files. |