aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-10-24 00:08:46 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-10-24 00:08:46 +0000
commit03ac099f6bc9157cdec50db10944e1d99ff07aa1 (patch)
tree9d818c011b71b40675d7de9779f1a4751fc5541c /nptl
parentebfd1bbd04fcc82c34d6f46d942ab763a60ede03 (diff)
downloadglibc-03ac099f6bc9157cdec50db10944e1d99ff07aa1.tar
glibc-03ac099f6bc9157cdec50db10944e1d99ff07aa1.tar.gz
glibc-03ac099f6bc9157cdec50db10944e1d99ff07aa1.tar.bz2
glibc-03ac099f6bc9157cdec50db10944e1d99ff07aa1.zip
Define and use $(run-built-tests).
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/Makefile6
2 files changed, 8 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 10b08426bb..2743631da4 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-23 Joseph Myers <joseph@codesourcery.com>
+
+ * Makefile [$(cross-compiling) = no]: Change condition to
+ [$(run-built-tests) = yes].
+
2012-10-23 Jim Blandy <jimb@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
diff --git a/nptl/Makefile b/nptl/Makefile
index c37071948f..02db930b6c 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -448,7 +448,7 @@ LDFLAGS-tst-atfork2 = -rdynamic
tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace
$(objpfx)tst-atfork2mod.so: $(shared-thread-library)
-ifeq ($(cross-compiling),no)
+ifeq ($(run-built-tests),yes)
tests: $(objpfx)tst-stack3-mem
endif
tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace
@@ -472,7 +472,7 @@ LDFLAGS-tst-tls5 = $(no-as-needed)
LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so
ifeq ($(build-shared),yes)
-ifeq ($(cross-compiling),no)
+ifeq ($(run-built-tests),yes)
tests: $(objpfx)tst-tls6.out
endif
$(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \
@@ -583,7 +583,7 @@ generated += banner.h
LDFLAGS-pthread.so += -e __nptl_main
endif
-ifeq (no,$(cross-compiling))
+ifeq ($(run-built-tests),yes)
ifeq (yes,$(build-shared))
tests: $(objpfx)tst-cancel-wrappers.out
$(objpfx)tst-cancel-wrappers.out: tst-cancel-wrappers.sh