From 8b196ac4b8d1be6021a3974f28bba5e947b37db8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 3 Dec 2019 10:58:52 +0100 Subject: Expand $(as-needed) and $(no-as-needed) throughout the build system Since commit a3cc4f48e94f32c9532ee36982ac00eb1e5719b0 ("Remove --as-needed configure test."), --as-needed support is no longer optional. The macros are not much shorter and do not provide documentary value, either, so this commit removes them. --- Makeconfig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Makeconfig') diff --git a/Makeconfig b/Makeconfig index 44b5f3a4d0..6d8e24fcc3 100644 --- a/Makeconfig +++ b/Makeconfig @@ -336,9 +336,6 @@ ifndef asm-CPPFLAGS asm-CPPFLAGS = endif -as-needed := -Wl,--as-needed -no-as-needed := -Wl,--no-as-needed - # Must be supported by the linker. no-whole-archive = -Wl,--no-whole-archive whole-archive = -Wl,--whole-archive @@ -569,8 +566,8 @@ endif # build-hardcoded-path-in-tests link-libc-before-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ $(common-objpfx)$(patsubst %,$(libtype.oS),c) \ - $(as-needed) $(elf-objpfx)ld.so \ - $(no-as-needed) + -Wl,--as-needed $(elf-objpfx)ld.so \ + -Wl,--no-as-needed link-libc = $(link-libc-before-gnulib) $(gnulib) link-libc-tests-after-rpath-link = $(link-libc-before-gnulib) $(gnulib-tests) -- cgit 1.4.1