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 /boehm-gc | |
| 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 'boehm-gc')
| -rw-r--r-- | boehm-gc/ChangeLog | 7 | ||||
| -rw-r--r-- | boehm-gc/Makefile.am | 4 | ||||
| -rw-r--r-- | boehm-gc/Makefile.in | 12 |
3 files changed, 14 insertions, 9 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index f5d7e2e5fc1..9f05a757d69 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,10 @@ +2009-09-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * 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. + 2009-09-08 Alexandre Oliva <aoliva@redhat.com> * configure: Rebuilt with modified libtool.m4. diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index 843891110c0..b074ac6df48 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -40,6 +40,7 @@ extra_ldflags_libgc = @extra_ldflags_libgc@ libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS) libgcjgc_la_DEPENDENCIES = @addobjs@ libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir) +libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS) libgcjgc_convenience_la_LIBADD = @addobjs@ libgcjgc_convenience_la_DEPENDENCIES = @addobjs@ @@ -49,8 +50,9 @@ AM_CFLAGS = @GC_CFLAGS@ check_PROGRAMS = gctest gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) gctest_LDFLAGS = -shared-libgcc +gctest_LINK = $(LINK) $(gctest_LDFLAGS) TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc TESTS = gctest diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index 70110d3e194..5b1cfe748a4 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -70,9 +70,6 @@ am_libgcjgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \ backgraph.lo win32_threads.lo pthread_support.lo \ pthread_stop_world.lo darwin_stop_world.lo $(am__objects_1) libgcjgc_la_OBJECTS = $(am_libgcjgc_la_OBJECTS) -libgcjgc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libgcjgc_la_LDFLAGS) $(LDFLAGS) -o $@ am__objects_2 = allchblk.lo alloc.lo blacklst.lo checksums.lo \ dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \ headers.lo malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo \ @@ -86,11 +83,8 @@ libgcjgc_convenience_la_OBJECTS = \ am__dirstamp = $(am__leading_dot)dirstamp am_gctest_OBJECTS = tests/test.$(OBJEXT) gctest_OBJECTS = $(am_gctest_OBJECTS) -gctest_DEPENDENCIES = ./libgcjgc.la $(am__DEPENDENCIES_1) \ +gctest_DEPENDENCIES = libgcjgc.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -gctest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gctest_LDFLAGS) \ - $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = am__depfiles_maybe = @@ -291,13 +285,15 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS) libgcjgc_la_DEPENDENCIES = @addobjs@ libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir) +libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS) libgcjgc_convenience_la_LIBADD = @addobjs@ libgcjgc_convenience_la_DEPENDENCIES = @addobjs@ AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) gctest_LDFLAGS = -shared-libgcc +gctest_LINK = $(LINK) $(gctest_LDFLAGS) TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc LTCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \ $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \ |