diff options
| -rw-r--r-- | Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile index c85dc364a8..5089063a55 100644 --- a/Makefile +++ b/Makefile @@ -225,20 +225,18 @@ tests-clean: tests: $(objpfx)c++-types-check.out ifneq ($(CXX),no) -ifneq (,$(wildcard scripts/data/c++-types-$(config-machine)-$(config-os).data)) -$(objpfx)c++-types-check.out: scripts/data/c++-types-$(config-machine)-$(config-os).data - scripts/check-c++-types.sh $^ $(CXX) $(filter-out -std=gnu99,$(CFLAGS)) $(CPPFLAGS) > $@ -else -ifneq (,$(wildcard scripts/data/c++-types-$(base-machine)-$(config-os).data)) -$(objpfx)c++-types-check.out: scripts/data/c++-types-$(base-machine)-$(config-os).data - scripts/check-c++-types.sh $^ $(CXX) $(filter-out -std=gnu99,$(CFLAGS)) $(CPPFLAGS) > $@ +check-data := $(firstword $(wildcard \ + $(foreach M,$(config-machine) $(base-machine),\ + scripts/data/c++-types-$M-$(config-os).data))) +ifneq (,$(check-data)) +$(objpfx)c++-types-check.out: $(check-data) + 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 -endif # The realclean target is just like distclean for the parent, but we want # the subdirs to know the difference in case they care. |