diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-08-22 00:30:51 +0000 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-01-04 13:33:12 +0100 |
| commit | d11bdaa1f114872e94c7a08f0beefac31b60c75d (patch) | |
| tree | d3b3881ffb24a3b03ec4c74df2524d9d8803a1ed | |
| parent | fc7ef00f02ee41452245926a4f7ff2073711db33 (diff) | |
| download | glibc-d11bdaa1f114872e94c7a08f0beefac31b60c75d.tar.gz glibc-d11bdaa1f114872e94c7a08f0beefac31b60c75d.tar.xz glibc-d11bdaa1f114872e94c7a08f0beefac31b60c75d.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. (cherry picked from commit 75dfe623df945db7dd3c12a206d743c45c16b5ed)
| -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 c8c392eac4..135ff6b518 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-10-11 Florian Weimer <fweimer@redhat.com> [BZ #22078] 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 |