61 lines
2 KiB
Diff
61 lines
2 KiB
Diff
From 947e2e0a9410c18eb44144456c7fe8e7c0e2a999 Mon Sep 17 00:00:00 2001
|
|
From: Joseph Myers <joseph@codesourcery.com>
|
|
Date: Tue, 22 Aug 2017 00:30:51 +0000
|
|
Subject: [PATCH 19] 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)
|
|
---
|
|
ChangeLog | 5 +++++
|
|
assert/Makefile | 4 ++--
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 23ded7f03d..87fa54c57b 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-28 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com>
|
|
|
|
[BZ #21930]
|
|
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
|
|
|