summary refs log tree commit diff
path: root/Makeconfig
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-12-03 10:58:52 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-12-03 21:37:50 +0100
commit8b196ac4b8d1be6021a3974f28bba5e947b37db8 (patch)
treeddb72963012501d3751a0da8bf6a640bb56f1da6 /Makeconfig
parent9fb8139079ef0bb1aa33a4ae418cbb113b9b9da7 (diff)
downloadglibc-8b196ac4b8d1be6021a3974f28bba5e947b37db8.tar.gz
glibc-8b196ac4b8d1be6021a3974f28bba5e947b37db8.tar.xz
glibc-8b196ac4b8d1be6021a3974f28bba5e947b37db8.zip
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.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig7
1 files changed, 2 insertions, 5 deletions
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)