diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-18 18:33:33 +0300 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
commit | 6b44aa9095316c7823880f25a745490e271c3400 (patch) | |
tree | 0f69153ba5b2a65dbac11c83e7108a6d1cf50730 /Makefile | |
parent | e82aeddb6f00d82a02e73aaa17190f9ba9a3b38f (diff) | |
download | qtlocation-mapboxgl-6b44aa9095316c7823880f25a745490e271c3400.tar.gz |
[build] Use cxx11abi suffix when needed
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -257,7 +257,8 @@ $(LINUX_BUILD): $(BUILD_DEPS) mkdir -p $(LINUX_OUTPUT_PATH) (cd $(LINUX_OUTPUT_PATH) && cmake -G Ninja ../../.. \ -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON) + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh)) .PHONY: linux linux: glfw-app render offline @@ -337,7 +338,8 @@ $(QT_BUILD): $(BUILD_DEPS) -DBUILD_PLATFORM=$(BUILD_PLATFORM) \ -DMBGL_PLATFORM=qt \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ - -DWITH_QT_4=${WITH_QT_4}) + -DWITH_QT_4=${WITH_QT_4} \ + -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh)) .PHONY: qt-app qt-app: $(QT_BUILD) |