summaryrefslogtreecommitdiff
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-02 16:50:42 -0700
commit6f0969aecade1fe960665c130d5aa2e8c59c441e (patch)
treea587946667a66a1a85376111ee27148c60bad888
parent7b243392e366907b35f819ac2d416475287d74ea (diff)
downloadqtlocation-mapboxgl-upstream/remove-gdb-mason.tar.gz
[build] Custom GDB no longer needed in Ubuntu Bionicupstream/remove-gdb-mason
-rw-r--r--Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 25bbde1b3d..d3df407fa7 100644
--- a/Makefile
+++ b/Makefile
@@ -319,14 +319,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-*