Message ID | 20160304230842.1271E2C3BBC@topped-with-meat.com |
---|---|
State | New |
Headers | show |
On Fri, 4 Mar 2016, Roland McGrath wrote: > ifneq (,$(CXX)) > vpath c++-types.data $(+sysdep_dirs) > > +tests-special += $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out > $(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh > scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu11 $(+gccwarn-c),$(CFLAGS)) $(CPPFLAGS) > $@; \ > $(evaluate-test) > endif > > +tests-special += $(objpfx)check-local-headers.out Adding check-local-headers.out both inside and outside the conditional looks wrong.
> Adding check-local-headers.out both inside and outside the conditional > looks wrong. D'oh. Editing is hard, let's go shopping.
diff --git a/Makefile b/Makefile index 9c6918d..0732d48 100644 --- a/Makefile +++ b/Makefile @@ -251,16 +251,16 @@ mostlyclean: parent-mostlyclean tests-clean: @$(MAKE) subdir_testclean no_deps=t -tests-special += $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out - ifneq (,$(CXX)) vpath c++-types.data $(+sysdep_dirs) +tests-special += $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out $(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu11 $(+gccwarn-c),$(CFLAGS)) $(CPPFLAGS) > $@; \ $(evaluate-test) endif +tests-special += $(objpfx)check-local-headers.out $(objpfx)check-local-headers.out: scripts/check-local-headers.sh AWK='$(AWK)' scripts/check-local-headers.sh \ "$(includedir)" "$(objpfx)" < /dev/null > $@; \