diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 16:44:16 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 16:44:16 +0300 |
| commit | 37f0c1b3cf97317cd0ea42466091c1cd0acd7509 (patch) | |
| tree | c655b35dbea3fadcc6e1d0be431cf0d80b1fad09 | |
| parent | e6e1b98e13854dbe558bc6b4e61e835febaa1c7c (diff) | |
| download | qtlocation-mapboxgl-upstream/gcc-4.9.tar.gz | |
[build] Reuse precomputed WITH_CXX11ABI definition in Qt buildsupstream/gcc-4.9
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -376,7 +376,7 @@ $(QT_BUILD): $(BUILD_DEPS) -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_I18N=${WITH_QT_I18N} \ -DWITH_QT_4=${WITH_QT_4} \ - -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ + -DWITH_CXX11ABI=${WITH_CXX11ABI} \ -DWITH_COVERAGE=${WITH_COVERAGE}) ifeq ($(HOST_PLATFORM), macos) @@ -392,7 +392,7 @@ $(MACOS_QT_PROJ_PATH): $(BUILD_DEPS) -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_I18N=${WITH_QT_I18N} \ -DWITH_QT_4=${WITH_QT_4} \ - -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ + -DWITH_CXX11ABI=${WITH_CXX11ABI} \ -DWITH_COVERAGE=${WITH_COVERAGE}) .PHONY: qtproj |