about summary refs log tree commit diff
path: root/elf/Makefile
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-08 09:52:29 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-08 09:52:29 -0500
commit2119dcfaccfa6fabf9e6be15f6d97ad041252ac9 (patch)
tree59aeb0bf04e9720306dcceb56074697c24116da0 /elf/Makefile
parent121766a9d6295d1b3f33b2171c3ad234615627c3 (diff)
downloadglibc-2119dcfaccfa6fabf9e6be15f6d97ad041252ac9.tar.gz
glibc-2119dcfaccfa6fabf9e6be15f6d97ad041252ac9.tar.xz
glibc-2119dcfaccfa6fabf9e6be15f6d97ad041252ac9.zip
Static linking is always needed
Diffstat (limited to 'elf/Makefile')
-rw-r--r--elf/Makefile4
1 files changed, 1 insertions, 3 deletions
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 \