summaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-04-03 08:53:24 +0000
committerUlrich Drepper <drepper@redhat.com>2004-04-03 08:53:24 +0000
commitfeca5e0be0d18ed2987fe714e1410673d62507db (patch)
tree47c15f90748ccc43159e646f0e22dc066a44e6f7 /Makeconfig
parent08c9a553c723f301d044062e72871c8d9e6fa510 (diff)
downloadglibc-feca5e0be0d18ed2987fe714e1410673d62507db.tar.gz
Update.
2004-03-30 H.J. Lu <hongjiu.lu@intel.com> * Makeconfig (link-libc-static): Use $(static-gnulib) instead of $(gnulib). (libgcc_eh): New variable. (gnulib): Use it variable. (static-gnulib): New variable. * Makerules (LDLIBS-c.so): Use $(static-gnulib) instead of $(gnulib). * config.make.in (have-as-needed): New variable. * configure.in: Check if linker supports --as-needed.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig15
1 files changed, 11 insertions, 4 deletions
diff --git a/Makeconfig b/Makeconfig
index e0b3433cdc..37bbb1df4c 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -504,12 +504,12 @@ endif
# The static libraries.
ifeq (yes,$(build-static))
-link-libc-static = $(common-objpfx)libc.a $(gnulib) $(common-objpfx)libc.a
+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 = $(gnulib) $(common-objpfx)libc_pic.a
+link-libc-static = $(static-gnulib) $(common-objpfx)libc_pic.a
link-extra-libs-static = $(link-extra-libs)
endif
endif
@@ -517,10 +517,17 @@ 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-as-needed),yes)
+ libgcc_eh := -lgcc_eh
+else
+ libgcc_eh := --as-needed -lgcc_s --no-as-needed
+endif
ifneq ($(have-cc-with-libunwind),yes)
- gnulib := -lgcc -lgcc_eh
+ gnulib := -lgcc $(libgcc_eh)
+ static-gnulib := -lgcc -lgcc_eh
else
- gnulib := -lgcc -lgcc_eh -lunwind
+ gnulib := -lgcc $(libgcc_eh) -lunwind
+ static-gnulib := -lgcc -lgcc_eh -lunwind
endif
endif
ifeq ($(elf),yes)