Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Conditionalize c++-types-check.out addition to tests-special.
  • Loading branch information
Roland McGrath committed Mar 4, 2016
1 parent 0800411 commit 1241b50
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
@@ -1,5 +1,8 @@
2016-03-04 Roland McGrath <roland@hack.frob.com> 2016-03-04 Roland McGrath <roland@hack.frob.com>


* Makefile (tests-special): Add $(objpfx)c++-types-check.out only
inside conditional for nonempty $(CXX).

* math/Makefile (tests): Add test-math-isinff only if $(CXX) is * math/Makefile (tests): Add test-math-isinff only if $(CXX) is
nonempty. nonempty.


Expand Down
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -251,16 +251,16 @@ mostlyclean: parent-mostlyclean
tests-clean: tests-clean:
@$(MAKE) subdir_testclean no_deps=t @$(MAKE) subdir_testclean no_deps=t


tests-special += $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out

ifneq (,$(CXX)) ifneq (,$(CXX))
vpath c++-types.data $(+sysdep_dirs) 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 $(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) > $@; \ scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu11 $(+gccwarn-c),$(CFLAGS)) $(CPPFLAGS) > $@; \
$(evaluate-test) $(evaluate-test)
endif endif


tests-special += $(objpfx)check-local-headers.out
$(objpfx)check-local-headers.out: scripts/check-local-headers.sh $(objpfx)check-local-headers.out: scripts/check-local-headers.sh
AWK='$(AWK)' scripts/check-local-headers.sh \ AWK='$(AWK)' scripts/check-local-headers.sh \
"$(includedir)" "$(objpfx)" < /dev/null > $@; \ "$(includedir)" "$(objpfx)" < /dev/null > $@; \
Expand Down

0 comments on commit 1241b50

Please sign in to comment.