diff options
| author | Roland McGrath <roland@gnu.org> | 2005-02-16 10:50:19 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-02-16 10:50:19 +0000 |
| commit | 8591e84ffec5f449d29b20babd3821b7a3c35fe0 (patch) | |
| tree | d4cffd853aee9b55df834f0da7bbdc803b48ea15 /Makeconfig | |
| parent | 81f07283d388e7c396d5b37e1b5d2db83b39f177 (diff) | |
2005-01-17 Roland McGrath <roland@redhat.com>
[BZ #745]
* Makeconfig (link-extra-libs): Define just as $(LDLIBS-$(@F)).
(link-extra-libs-static): Define to $(link-extra-libs).
(link-extra-libs-bounded): Likewise.
Diffstat (limited to 'Makeconfig')
| -rw-r--r-- | Makeconfig | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Makeconfig b/Makeconfig index d267e5af21..1a9ad873e5 100644 --- a/Makeconfig +++ b/Makeconfig @@ -480,32 +480,21 @@ default-rpath = $(libdir) endif ifndef link-extra-libs -ifeq (yes,$(build-shared)) -ifneq ($(common-objpfx),$(objpfx)) -link-extra-libs = $(foreach lib,$(LDLIBS-$(@F)),\ - $(wildcard $(common-objpfx)$(lib).so$($(notdir $(lib)).so-version) \ - $(objpfx)$(lib).so$($(notdir $(lib)).so-version))) -else -link-extra-libs = $(foreach lib,$(LDLIBS-$(@F)),$(common-objpfx)$(lib).so$($(notdir $(lib)).so-version)) -endif -else -link-extra-libs = $(foreach lib,$(LDLIBS-$(@F)),$(common-objpfx)$(lib).a) -endif +link-extra-libs = $(LDLIBS-$(@F)) +link-extra-libs-static = $(link-extra-libs) +link-extra-libs-bounded = $(link-extra-libs) endif # The static libraries. ifeq (yes,$(build-static)) link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a -link-extra-libs-static = $(foreach lib,$(LDLIBS-$(@F)),$(common-objpfx)$(lib).a) else ifeq (yes,$(build-shared)) # We can try to link the programs with lib*_pic.a... link-libc-static = $(static-gnulib) $(common-objpfx)libc_pic.a -link-extra-libs-static = $(link-extra-libs) endif endif link-libc-bounded = $(common-objpfx)libc_b.a $(gnulib) $(common-objpfx)libc_b.a -link-extra-libs-bounded = $(foreach lib,$(LDLIBS-$(@F:%-bp=%)),$(common-objpfx)$(lib)_b.a) ifndef gnulib ifneq ($(have-cc-with-libunwind),yes) |