Fix position of tests-unsupported definition in assert/Makefile.

tests-unsupported has to be defined before the inclusion of Rules in a
subdirectory Makefile; otherwise it is ineffective.  This patch fixes
the ordering in assert/Makefile, where a recent test addition put
tests-unsupported too late (resulting in build failures when the C++
compiler was missing or broken, and thereby showing up the unrelated
bug 21987).

Incidentally, I don't see why these tests depend on
$(have-cxx-thread_local) rather than just a working C++ compiler.

Tested in such a configuration (broken compiler/libstdc++) with
build-many-glibcs.py.

	* assert/Makefile [$(have-cxx-thread_local)]: Move conditional
	variable definitions above inclusion of ../Rules.

diff --git a/ChangeLog b/ChangeLog
index bf3e893f25941a07484f7063b7989d70de49f9d5..7953c0123bf0333514d16c11b0c8326b77ede7ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-22  Joseph Myers  <joseph@codesourcery.com>
+
+       * assert/Makefile [$(have-cxx-thread_local)]: Move conditional
+       variable definitions above inclusion of ../Rules.
+
 2017-08-21  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/ieee754/k_standard.c (__kernel_standard): Add default

diff --git a/assert/Makefile b/assert/Makefile
index 9ec1be81a95631c859eb9b68d46709661201e923..222ab516f02aa7cb3eaca041d2a8647bad9960cf 100644 (file)
--- a/assert/Makefile
+++ b/assert/Makefile
@@ -27,8 +27,6 @@ headers       := assert.h
 routines := assert assert-perr __assert
 tests := test-assert test-assert-perr tst-assert-c++ tst-assert-g++
 
-include ../Rules
-
 ifeq ($(have-cxx-thread_local),yes)
 CFLAGS-tst-assert-c++.o = -std=c++11
 LDLIBS-tst-assert-c++ = -lstdc++
@@ -37,3 +35,5 @@ LDLIBS-tst-assert-g++ = -lstdc++
 else
 tests-unsupported += tst-assert-c++ tst-assert-g++
 endif
+
+include ../Rules