diff --git a/Makefile b/Makefile
index cb2566a0a17d..bbc521f4c0e5 100644
--- a/Makefile
+++ b/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/test/Makefile b/test/Makefile
index 8c7989988689..684a67b47dcb 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