diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-03 22:26:05 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-10 11:36:56 +0300 |
| commit | 4213dc53dccf9028038dbe6933b224d171ef5c3a (patch) | |
| tree | 55ea51091334352b8161eead857a96a4406fc894 /scripts/main.mk | |
| parent | 8ff9bcb22a94567a555cd2c75b051d0979101ff7 (diff) | |
| download | qtlocation-mapboxgl-4213dc53dccf9028038dbe6933b224d171ef5c3a.tar.gz | |
[Qt] Use C++11 ABI packages
These were causing linking errors on more recent Linux distros.
Fixes #3123.
Diffstat (limited to 'scripts/main.mk')
| -rw-r--r-- | scripts/main.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/main.mk b/scripts/main.mk index bc7506db5c..56b3fcd0c5 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -2,6 +2,7 @@ ifeq ($(shell uname -s), Darwin) export PLATFORM ?= osx else ifeq ($(shell uname -s), Linux) export PLATFORM ?= linux + export CXX11ABI = $(shell scripts/check-cxx11abi.sh) endif ifeq ($(PLATFORM),android) @@ -48,6 +49,7 @@ ifeq ($(PLATFORM),qt) endif # Defaults if not set +export CXX11ABI ?= "" export PLATFORM_OUTPUT ?= ./build/$(PLATFORM_SLUG) export PLATFORM_CONFIG_INPUT ?= platform/$(MASON_PLATFORM)/scripts/configure.sh export PLATFORM_CONFIG_OUTPUT ?= $(PLATFORM_OUTPUT)/config.gypi |