summaryrefslogtreecommitdiff
path: root/scripts/clang-tools.sh
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-02-08 13:26:23 +0100
committerKonstantin Käfer <mail@kkaefer.com>2017-02-08 19:07:16 +0100
commitbb931505c5f11c21a31cdd7be6fe036ca44e729d (patch)
treee0310f3a4965dbe364639efb610d96eeca49ee19 /scripts/clang-tools.sh
parentf5b86c0f11bc921647d1f677b62a14527bfb50c3 (diff)
downloadqtlocation-mapboxgl-bb931505c5f11c21a31cdd7be6fe036ca44e729d.tar.gz
[build] Remove Mason submodule in favor of CMake mason
Diffstat (limited to 'scripts/clang-tools.sh')
-rwxr-xr-xscripts/clang-tools.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/clang-tools.sh b/scripts/clang-tools.sh
index ae3a5fa0e7..2a330a5ee4 100755
--- a/scripts/clang-tools.sh
+++ b/scripts/clang-tools.sh
@@ -3,10 +3,8 @@
set -e
set -o pipefail
-export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
-
-CLANG_TIDY=${CLANG_TIDY:-$(mason prefix clang-tidy 3.9.1)/bin/clang-tidy}
-CLANG_FORMAT=${CLANG_FORMAT:-$(mason prefix clang-format 3.9.1)/bin/clang-format}
+CLANG_TIDY=${CLANG_TIDY:-$(scripts/mason.sh PREFIX clang-tidy VERSION 3.9.1)/bin/clang-tidy}
+CLANG_FORMAT=${CLANG_FORMAT:-$(scripts/mason.sh PREFIX clang-format VERSION 3.9.1)/bin/clang-format}
command -v ${CLANG_TIDY} >/dev/null 2>&1 || {
echo "Can't find ${CLANG_TIDY} in PATH."