From bd29910a8a8e129d39b17b4c8cb17f35d247ebc3 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 17 Jul 2012 14:44:06 +0000 Subject: Move c++-types baselines to sysdeps directories. --- Makefile | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 89588c1e8a..b0d3edb1a7 100644 --- a/Makefile +++ b/Makefile @@ -272,21 +272,11 @@ tests-clean: tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out ifneq ($(CXX),no) -check-data := $(firstword $(wildcard \ - $(foreach D,$(add-ons) scripts,\ - $(patsubst %,$D/data/c++-types-%.data,\ - $(abi-name) \ - $(addsuffix -$(config-os),\ - $(config-machine) \ - $(base-machine)))))) -ifneq (,$(check-data)) -$(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh + +vpath c++-types.data $(+sysdep_dirs) + +$(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@ -else -$(objpfx)c++-types-check.out: - @echo 'WARNING C++ tests not run; create a c++-types-XXX file' - @echo "not run" > $@ -endif endif $(objpfx)check-local-headers.out: scripts/check-local-headers.sh -- cgit 1.4.1