From cdb4e2b783e20368c1738cc2ba8ca265a4e1865e Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Wed, 8 Jan 2014 13:00:32 +0000 Subject: [PATCH] Define ENABLE_CLANG_EXAMPLES instead of relying on BUILD_EXAMPLES This is a further build fix attempt for r198747 on some Makefile builders where the value wasn't set at all. llvm-svn: 198764 --- clang/Makefile | 6 ++++++ clang/test/Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/clang/Makefile b/clang/Makefile index cb2566a0a17d..bbc521f4c0e5 100644 --- a/clang/Makefile +++ b/clang/Makefile @@ -23,6 +23,12 @@ ifeq ($(BUILD_EXAMPLES),1) endif endif +ifeq ($(BUILD_EXAMPLES),1) + ENABLE_CLANG_EXAMPLES := 1 +else + ENABLE_CLANG_EXAMPLES := 0 +endif + ifeq ($(MAKECMDGOALS),libs-only) DIRS := $(filter-out tools docs, $(DIRS)) OPTIONAL_DIRS := diff --git a/clang/test/Makefile b/clang/test/Makefile index 8c7989988689..684a67b47dcb 100644 --- a/clang/test/Makefile +++ b/clang/test/Makefile @@ -49,7 +49,7 @@ lit.site.cfg: FORCE @$(ECHOPATH) s=@ENABLE_CLANG_ARCMT@=$(ENABLE_CLANG_ARCMT)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_CLANG_REWRITER@=$(ENABLE_CLANG_REWRITER)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_CLANG_STATIC_ANALYZER@=$(ENABLE_CLANG_STATIC_ANALYZER)=g >> lit.tmp - @$(ECHOPATH) s=@ENABLE_CLANG_EXAMPLES@=$(BUILD_EXAMPLES)=g >> lit.tmp + @$(ECHOPATH) s=@ENABLE_CLANG_EXAMPLES@=$(ENABLE_CLANG_EXAMPLES)=g >> lit.tmp @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@ @-rm -f lit.tmp