From bf21fa1ff8412089606c6c3aa4cc0dbebfe91b2d Mon Sep 17 00:00:00 2001
From: Julian Rex <julian.rex@gmail.com>
Date: Tue, 2 Apr 2019 16:44:02 -0400
Subject: [core] Adds target branch parameter to clang-tools.sh (#14301)

---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index df1ba21afd..df476fd677 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 export BUILDTYPE ?= Debug
 export IS_LOCAL_DEVELOPMENT ?= true
 export WITH_CXX11ABI ?= $(shell scripts/check-cxx11abi.sh)
+export TARGET_BRANCH ?= master
+
 
 ifeq ($(BUILDTYPE), Release)
 else ifeq ($(BUILDTYPE), RelWithDebInfo)
@@ -191,12 +193,11 @@ compdb: $(BUILD_DEPS) $(TEST_DEPS) $(MACOS_COMPDB_PATH)/Makefile
 
 .PHONY: tidy
 tidy: compdb
-	scripts/clang-tools.sh $(MACOS_COMPDB_PATH)
+	scripts/clang-tools.sh $(MACOS_COMPDB_PATH) $(TARGET_BRANCH)
 
 .PHONY: check
 check: compdb
-	scripts/clang-tools.sh $(MACOS_COMPDB_PATH) --diff
-
+	scripts/clang-tools.sh $(MACOS_COMPDB_PATH) $(TARGET_BRANCH) --diff
 endif
 
 #### iOS targets ##############################################################
@@ -383,11 +384,11 @@ compdb: $(LINUX_BUILD)
 
 .PHONY: tidy
 tidy: compdb
-	scripts/clang-tools.sh $(LINUX_OUTPUT_PATH)
+	scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) $(TARGET_BRANCH)
 
 .PHONY: check
 check: compdb
-	scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) --diff
+	scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) $(TARGET_BRANCH) --diff
 
 endif
 
-- 
cgit v1.2.1