diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-08-22 00:30:51 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-08-22 00:30:51 +0000 |
| commit | 75dfe623df945db7dd3c12a206d743c45c16b5ed (patch) | |
| tree | 35d29ea3b30e9c6f14d33406e00485e4c6fa5fe8 | |
| parent | ea99fcd03875caf59ceda354ec8ed813bb5a5f79 (diff) | |
| download | glibc-75dfe623df945db7dd3c12a206d743c45c16b5ed.tar.gz glibc-75dfe623df945db7dd3c12a206d743c45c16b5ed.tar.xz glibc-75dfe623df945db7dd3c12a206d743c45c16b5ed.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | assert/Makefile | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index bf3e893f25..7953c0123b 100644 --- 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 9ec1be81a9..222ab516f0 100644 --- 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 |