diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-21 20:08:56 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-21 20:08:56 (GMT) |
| commit | af92d15b625d2042814323fcebfa41c5bbb6b09d (patch) | |
| tree | 13cf3dce4252c2b5ef166860e9a423d72f630da9 /mkspecs | |
| parent | 511c434b959be96c992e59f4a2748ac251d5c72a (diff) | |
| parent | 26eda5fa33e401a1803b42e6eacf0921ddc6a14e (diff) | |
| download | Qt-af92d15b625d2042814323fcebfa41c5bbb6b09d.zip Qt-af92d15b625d2042814323fcebfa41c5bbb6b09d.tar.gz Qt-af92d15b625d2042814323fcebfa41c5bbb6b09d.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 2 | ||||
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index 8892d2a..e21ee5c 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -15,7 +15,7 @@ INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off # libstdcppv5 is preferred over libstdcpp as it has/uses the throwing version of operator new -exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll ) { +exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) { LIBS *= -llibstdcppv5.dll # STDCPP turns on standard C++ new behaviour (ie. throwing new) diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm index 7fada1e..634fafa 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm @@ -9,6 +9,14 @@ include $(FLMHOME)/metaflm.mk +SINGLETON:=$(call sanitise,TSTORE_SINGLETON_$(EXTENSION_ROOT)) + +ifeq ($($(SINGLETON)),) +# Prevent duplicate targets from being created, as that can lead to build breaks +# in multiprocessor systems if two or more targets try to write to .make.cache at +# the same time. +$(SINGLETON):=1 + STORE_BUILD_TARGET:=$(call sanitise,TSTORE_BUILD_$(PLATFORM_PATH)_$(CFG_PATH)_$(EXTENSION_ROOT)) CACHE_FILENAME:=$(EXTENSION_ROOT)/.make.cache @@ -37,4 +45,5 @@ endef $(eval $(qmake_store_build)) $(eval $(call GenerateStandardCleanTarget,$(CACHE_FILENAME),'')) +endif |