about summary refs log tree commit diff
path: root/dlfcn
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 /dlfcn
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 'dlfcn')
-rw-r--r--dlfcn/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index 363278aced..34b1b5d450 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -36,12 +36,12 @@ endif
 ifeq (yes,$(build-shared))
 tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \
 	bug-dlopen1 bug-dlsym1 tst-dlinfo bug-atexit1 bug-atexit2 \
-	bug-atexit3 tstatexit bug-dl-leaf tst-rec-dlopen
+	tstatexit bug-dl-leaf tst-rec-dlopen
 endif
 modules-names = glreflib1 glreflib2 glreflib3 failtestmod defaultmod1 \
 		defaultmod2 errmsg1mod modatexit modcxaatexit \
 		bug-dlsym1-lib1 bug-dlsym1-lib2 bug-atexit1-lib \
-		bug-atexit2-lib bug-atexit3-lib bug-dl-leaf-lib \
+		bug-atexit2-lib bug-dl-leaf-lib \
 		bug-dl-leaf-lib-cb moddummy1 moddummy2
 
 failtestmod.so-no-z-defs = yes
@@ -57,6 +57,11 @@ tststatic2-ENV = $(tststatic-ENV)
 tststatic3-ENV = $(tststatic-ENV)
 tststatic4-ENV = $(tststatic-ENV)
 tststatic5-ENV = $(tststatic-ENV)
+
+ifneq (,$(CXX))
+tests += bug-atexit3
+modules-names += bug-atexit3-lib
+endif
 endif
 
 extra-test-objs += $(modules-names:=.os)