From 2119dcfaccfa6fabf9e6be15f6d97ad041252ac9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 8 Jan 2012 09:52:29 -0500 Subject: Static linking is always needed --- elf/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'elf/Makefile') diff --git a/elf/Makefile b/elf/Makefile index b010085b29..052e763115 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -200,9 +200,8 @@ tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 ifeq (yes,$(have-initfini-array)) tests += tst-array1 tst-array2 tst-array3 tst-array4 tst-array5 endif -ifeq (yes,$(build-static)) tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static -ifeq (yesyes,$(build-static)$(build-shared)) +ifeq (yes,$(build-shared)) tests-static += tst-tls9-static tst-tls9-static-ENV = \ LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)dlfcn @@ -211,7 +210,6 @@ ifeq (yes,$(have-initfini-array)) tests-static += tst-array1-static tst-array5-static endif tests += $(tests-static) -endif ifeq (yes,$(build-shared)) tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ constload1 order vismain noload filter unload \ -- cgit 1.4.1