summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-04-06 15:15:16 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-04-10 15:20:17 +0300
commit76edc6ee69ec9a8aaa0b0207aed06f257ff5fd83 (patch)
tree84edbc83c1fc6ca8a22958f92f9ac3c8b70d747a
parentdf22b614af2cf8d468d5e6fe3fcae129b5b95df0 (diff)
downloadqtlocation-mapboxgl-76edc6ee69ec9a8aaa0b0207aed06f257ff5fd83.tar.gz
[build] Use 'nodejs' if 'node' is not found in android-configuration
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2eb2728b8a..8346eda0c5 100644
--- a/Makefile
+++ b/Makefile
@@ -309,7 +309,7 @@ test: $(LINUX_BUILD)
benchmark: $(LINUX_BUILD)
$(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-benchmark
-ifneq (,$(shell which gdb))
+ifneq (,$(shell command -v gdb))
GDB = gdb -batch -return-child-result -ex 'set print thread-events off' -ex 'run' -ex 'thread apply all bt' --args
endif
@@ -496,7 +496,7 @@ style-code: android-style-code
# Configuration file for running CMake from Gradle within Android Studio.
platform/android/configuration.gradle:
- @echo "ext {\n node = '`which node`'\n npm = '`which npm`'\n ccache = '`which ccache`'\n}" > $@
+ @echo "ext {\n node = '`command -v node | command -v nodejs`'\n npm = '`command -v npm`'\n ccache = '`command -v ccache`'\n}" > $@
define ANDROID_RULES
# $1 = arm-v7 (short arch)