diff options
author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-02-10 08:00:24 +0000 |
---|---|---|
committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-02-10 08:00:24 +0000 |
commit | 6f6c767ccfbaff75eb44beb7771df877dcd855bb (patch) | |
tree | 767977ecd796812aa67661af18ea9f29fcf760ee /boehm-gc | |
parent | d011df4af27ce866ffa9e531d6d208c1482b2afc (diff) | |
download | gcc-6f6c767ccfbaff75eb44beb7771df877dcd855bb.tar.gz |
2009-02-10 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r144050
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@144052 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
-rw-r--r-- | boehm-gc/ChangeLog | 6 | ||||
-rw-r--r-- | boehm-gc/Makefile.am | 3 | ||||
-rw-r--r-- | boehm-gc/Makefile.in | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 0f58348c978..3ce034a0931 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,9 @@ +2009-02-09 Mark Mitchell <mark@codesourcery.com> + + * Makefile.am (LTLDFLAGS): New variable. + (LINK): Use it. + * Makefile.in: Regenerated. + 2008-12-18 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * configure: Regenerate. diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index 567d5979e5e..41528ae14ea 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -66,7 +66,8 @@ TESTS = gctest ## CFLAGS, not those passed in from the top level make. LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@ +LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LTLDFLAGS) -o $@ # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index 8b4e3a291de..d6dcd9bcb5b 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -317,7 +317,8 @@ TESTS = gctest LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@ +LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LTLDFLAGS) -o $@ # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and |