mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-13 23:00:22 +00:00
947e2e0a94
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 75dfe623df)
40 lines
1.2 KiB
Makefile
40 lines
1.2 KiB
Makefile
# Copyright (C) 1991-2017 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Sub-makefile for assert portion of the library.
|
|
#
|
|
subdir := assert
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := assert.h
|
|
|
|
routines := assert assert-perr __assert
|
|
tests := test-assert test-assert-perr tst-assert-c++ tst-assert-g++
|
|
|
|
ifeq ($(have-cxx-thread_local),yes)
|
|
CFLAGS-tst-assert-c++.o = -std=c++11
|
|
LDLIBS-tst-assert-c++ = -lstdc++
|
|
CFLAGS-tst-assert-g++.o = -std=gnu++11
|
|
LDLIBS-tst-assert-g++ = -lstdc++
|
|
else
|
|
tests-unsupported += tst-assert-c++ tst-assert-g++
|
|
endif
|
|
|
|
include ../Rules
|