diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-12 15:10:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-12 23:47:45 +0200 |
| commit | 26286d354aeda6923ed43e7643693e0b00c25887 (patch) | |
| tree | a29504784779d27dcb9cabd77b9a4f0d19230815 | |
| parent | 5b414f73d60f94c0119df844c6c850af6b882662 (diff) | |
Fixed unstable v8 compile failure in debug-and-release builds
In debug-and-release builds, the generated sources from the debug and
the release build would race with each other. This could cause the
source to be truncated during compilation, resulting in build failures
referring to undefined symbols.
Change-Id: Ib9eca2551d1e6c055a29be33ba46eab92f5b1861
Reviewed-on: http://codereview.qt-project.org/4626
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
| -rw-r--r-- | src/v8/v8.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/v8/v8.pri b/src/v8/v8.pri index dde953ca0d..79c4bd0714 100644 --- a/src/v8/v8.pri +++ b/src/v8/v8.pri @@ -17,7 +17,10 @@ else:error("Couldn't detect supported architecture ($$QMAKE_HOST.arch/$$QT_ARCH) include($$PWD/v8base.pri) -V8_GENERATED_SOURCES_DIR = generated +# In debug-and-release builds, generated sources must not go to the same +# directory, or they could clobber each other in highly parallelized builds +CONFIG(debug, debug|release):V8_GENERATED_SOURCES_DIR = generated-debug +else: V8_GENERATED_SOURCES_DIR = generated-release !contains(QT_CONFIG, static): DEFINES += V8_SHARED BUILDING_V8_SHARED |