about summary refs log tree commit diff
path: root/nptl/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-03-04 13:52:45 -0800
committerRoland McGrath <roland@hack.frob.com>2015-03-04 13:52:45 -0800
commite4693aa7c1777e6849b7bbb5fc9061e883bd58fd (patch)
treef89dc38ae728741604ae089adc528f8e361dd33e /nptl/Makefile
parent8e2e833ac4d6509b152d6b8d74d388725717c56f (diff)
downloadglibc-e4693aa7c1777e6849b7bbb5fc9061e883bd58fd.tar.gz
glibc-e4693aa7c1777e6849b7bbb5fc9061e883bd58fd.tar.xz
glibc-e4693aa7c1777e6849b7bbb5fc9061e883bd58fd.zip
Avoid C++ tests when the C++ cannot be linked.
Diffstat (limited to 'nptl/Makefile')
-rw-r--r--nptl/Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 89fdc8b9b4..00d13cf859 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -245,8 +245,8 @@ tests = tst-typesizes \
 	tst-cancel6 tst-cancel7 tst-cancel8 tst-cancel9 tst-cancel10 \
 	tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \
 	tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel19 tst-cancel20 \
-	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 tst-cancel25 \
-	tst-cancel-self tst-cancel-self-cancelstate \
+	tst-cancel21 tst-cancel22 tst-cancel23 $(if $(CXX),tst-cancel24) \
+	tst-cancel25 tst-cancel-self tst-cancel-self-cancelstate \
 	tst-cancel-self-canceltype tst-cancel-self-testcancel \
 	tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 tst-cleanup4 \
 	tst-flock1 tst-flock2 \
@@ -364,14 +364,19 @@ link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \
 		    $(common-objpfx)libc.a
 
 tests-static += tst-locale1 tst-locale2 tst-stackguard1-static \
-		tst-cancel21-static tst-cancel24-static tst-cond8-static \
+		tst-cancel21-static tst-cond8-static \
 		tst-mutex8-static tst-mutexpi8-static tst-sem11-static \
 		tst-sem12-static
-tests += tst-stackguard1-static tst-cancel21-static tst-cancel24-static \
+tests += tst-stackguard1-static tst-cancel21-static \
 	 tst-cond8-static tst-mutex8-static tst-mutexpi8-static \
 	 tst-sem11-static tst-sem12-static
 xtests-static += tst-setuid1-static
 
+ifneq (,$(CXX))
+tests += tst-cancel24-static
+tests-static += tst-cancel24-static
+endif
+
 # These tests are linked with libc before libpthread
 tests-reverse += tst-cancel5 tst-cancel23 tst-vfork1x tst-vfork2x