summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2018-10-02 16:50:42 -0700
committerBruno de Oliveira Abinader <bruno@mapbox.com>2018-10-08 16:27:24 +0300
commitd21c126f9def8627c2b33ec1eabde266cb9c42fe (patch)
treeb9597e3c72f6635f7a6074c75a6f0c3f5af502a9 /Makefile
parentf1506d10dac056269ee8bbb81406cf714bd8a1e9 (diff)
downloadqtlocation-mapboxgl-d21c126f9def8627c2b33ec1eabde266cb9c42fe.tar.gz
[build] Custom GDB no longer needed in Ubuntu Bionic
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 02ed977f0e..0ea3dfdb90 100644
--- a/Makefile
+++ b/Makefile
@@ -323,14 +323,12 @@ test: $(LINUX_BUILD)
benchmark: $(LINUX_BUILD)
$(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-benchmark
-ifneq (,$(shell command -v gdb 2> /dev/null))
- GDB ?= $(shell scripts/mason.sh PREFIX gdb VERSION 2017-04-08-aebcde5)/bin/gdb \
- -batch -return-child-result \
- -ex 'set print thread-events off' \
- -ex 'set disable-randomization off' \
- -ex 'run' \
- -ex 'thread apply all bt' --args
-endif
+GDB ?= gdb \
+ -batch -return-child-result \
+ -ex 'set print thread-events off' \
+ -ex 'set disable-randomization off' \
+ -ex 'run' \
+ -ex 'thread apply all bt' --args
.PHONY: run-test
run-test: run-test-*