This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26-158-g75dfe62
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Aug 2017 00:31:22 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26-158-g75dfe62
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 75dfe623df945db7dd3c12a206d743c45c16b5ed (commit)
from ea99fcd03875caf59ceda354ec8ed813bb5a5f79 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=75dfe623df945db7dd3c12a206d743c45c16b5ed
commit 75dfe623df945db7dd3c12a206d743c45c16b5ed
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Aug 22 00:30:51 2017 +0000
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 bf3e893..7953c01 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 9ec1be8..222ab51 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
assert/Makefile | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources