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 | cdb4e2b783e20368c1738cc2ba8ca265a4e1865e (patch) | |
| tree | f8169224ce564c232a739bbf0885042e9507f9ed | |
| parent | adfc88599788bf8f885fa5898f02988bc2e8b2dc (diff) | |
| download | bcm5719-llvm-cdb4e2b783e20368c1738cc2ba8ca265a4e1865e.tar.gz bcm5719-llvm-cdb4e2b783e20368c1738cc2ba8ca265a4e1865e.zip | |
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
| -rw-r--r-- | clang/Makefile | 6 | ||||
| -rw-r--r-- | clang/test/Makefile | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/clang/Makefile b/clang/Makefile index cb2566a0a17..bbc521f4c0e 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 8c798998868..684a67b47dc 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 |
