[build] Avoid variable name coupling between main.mk and clang-tidy.sh

This commit is contained in:
John Firebaugh
2016-05-23 17:19:07 -07:00
parent c6256de2e8
commit 58cd5cae12
2 changed files with 4 additions and 2 deletions

View File

@@ -3,6 +3,8 @@
set -e
set -o pipefail
directory=$1
export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
command -v ${CLANG_TIDY:-clang-tidy} >/dev/null 2>&1 || {
@@ -13,7 +15,7 @@ command -v ${CLANG_TIDY:-clang-tidy} >/dev/null 2>&1 || {
exit 1
}
cd build/${PLATFORM}-${SUBPLATFORM}/${BUILDTYPE}
cd "${directory}"
git ls-files '../../../src/mbgl/*.cpp' '../../../platform/*.cpp' '../../../test/*.cpp' | \
xargs -I{} -P ${JOBS} ${CLANG_TIDY:-clang-tidy} -header-filter='\/mbgl\/' {}

View File

@@ -139,7 +139,7 @@ tidy: Ninja/compdb
@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Generating header files...$(FORMAT_END)\n"
$(ENV) deps/ninja/ninja-$(PLATFORM) -C $(PLATFORM_OUTPUT)/$(BUILDTYPE) version shaders
@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Running tidy...$(FORMAT_END)\n"
@./scripts/clang-tidy.sh
@./scripts/clang-tidy.sh $(PLATFORM_OUTPUT)/$(BUILDTYPE)
#### Run tests #################################################################