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. --- nptl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nptl/Makefile') diff --git a/nptl/Makefile b/nptl/Makefile index bcf97ec0bd..fffd9462ff 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -591,7 +591,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library) $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) -LDFLAGS-tst-tls5 = $(no-as-needed) +LDFLAGS-tst-tls5 = -Wl,--no-as-needed LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so ifeq ($(build-shared),yes) @@ -631,7 +631,7 @@ LDFLAGS-tst-_res1mod2.so = -Wl,-soname,tst-_res1mod2.so $(objpfx)tst-_res1: $(objpfx)tst-_res1mod1.so $(objpfx)tst-_res1mod2.so \ $(shared-thread-library) -LDLIBS-tst-cancel24 = $(no-as-needed) -lstdc++ +LDLIBS-tst-cancel24 = -Wl,--no-as-needed -lstdc++ LDLIBS-tst-cancel24-static = $(LDLIBS-tst-cancel24) extra-B-pthread.so = -B$(common-objpfx)nptl/ -- cgit 1.4.1