From 26286d354aeda6923ed43e7643693e0b00c25887 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 12 Sep 2011 15:10:16 +1000 Subject: 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 Reviewed-by: Sarah Jane Smith --- src/v8/v8.pri | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/v8/v8.pri') 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 -- cgit v1.2.3