diff --git a/scripts/clang-tidy.sh b/scripts/clang-tidy.sh
index ee3c1193e..942051874 100755
--- a/scripts/clang-tidy.sh
+++ b/scripts/clang-tidy.sh
@@ -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\/' {}
diff --git a/scripts/main.mk b/scripts/main.mk
index bb18411d5..fd73867f2 100644
--- a/scripts/main.mk
+++ b/scripts/main.mk
@@ -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 #################################################################