diff options
| author | Alp Toker <alp@nuanti.com> | 2014-01-08 13:00:32 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-01-08 13:00:32 +0000 |
| commit | 8da8f6b67634340cc5872e462a5acb6695c4099f (patch) | |
| tree | 32c0f32a421674252750e9fac9d222843512d98b | |
| parent | 4d4511374770b111252dc1525f9f02e831647261 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@198764 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | test/Makefile | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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/test/Makefile b/test/Makefile index 8c79899886..684a67b47d 100644 --- a/test/Makefile +++ b/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 |