diff options
| author | hausmann@webkit.org <hausmann@webkit.org> | 2013-02-27 12:05:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-01 09:15:57 +0100 |
| commit | 6da40bf3d504020da4394cd2509ad988e5e81ab6 (patch) | |
| tree | 0e0d81cdcb7991356ab75fc5e4e31c2b41dca3aa | |
| parent | 4b30e126887090c336e1ca5d1440e222793b4a12 (diff) | |
| download | qtwebkit-6da40bf3d504020da4394cd2509ad988e5e81ab6.tar.gz | |
Fix massive parallel builds
Reviewed by Tor Arne Vestbø.
There exists a race condition that LLIntDesiredOffsets.h is written to
by two parllel instances of the ruby script. This patch ensures that similar to the output file,
the generated file is also prefixed according to the build configuration.
* LLIntOffsetsExtractor.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@144168 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: Ibf60cf455c342fce5a4244aba788a2ad8e18e136
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| -rw-r--r-- | Source/JavaScriptCore/ChangeLog | 12 | ||||
| -rw-r--r-- | Source/JavaScriptCore/LLIntOffsetsExtractor.pro | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 18927d19e..d21e34a30 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,15 @@ +2013-02-27 Simon Hausmann <simon.hausmann@digia.com> + + [Qt][Mac] Fix massive parallel builds + + Reviewed by Tor Arne Vestbø. + + There exists a race condition that LLIntDesiredOffsets.h is written to + by two parllel instances of the ruby script. This patch ensures that similar to the output file, + the generated file is also prefixed according to the build configuration. + + * LLIntOffsetsExtractor.pro: + 2012-12-18 Mark Hahnenberg <mhahnenberg@apple.com> Restrictions on oversize CopiedBlock allocations should be relaxed diff --git a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro index 50cdd44ef..97b3529b7 100644 --- a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro +++ b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro @@ -8,8 +8,6 @@ TEMPLATE = app TARGET = LLIntOffsetsExtractor -macx: DESTDIR = $$activeBuildConfig() - debug_and_release { CONFIG += force_build_all CONFIG += build_all @@ -59,6 +57,12 @@ llint.commands = ruby $$llint.script ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} llint.CONFIG += no_link QMAKE_EXTRA_COMPILERS += llint +macx { + DESTDIR = $$activeBuildConfig() + llint.output = $$activeBuildConfig()/$$llint.output + INCLUDEPATH += $$activeBuildConfig() +} + # Compilation of this file will automatically depend on LLIntDesiredOffsets.h # due to qmake scanning the source file for header dependencies. SOURCES = llint/LLIntOffsetsExtractor.cpp |