diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-15 10:26:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-15 10:26:48 +0100 |
| commit | 79a88444f611ce793d7548de5dc07f182b096054 (patch) | |
| tree | 19b638c276fb4a4f4fc858b4d771d91317b4ebea /Source/JavaScriptCore | |
| parent | 3db4e05af46453be130a174f08bb7619d858b676 (diff) | |
| parent | c8978f4e517618ba11065ab7d7540e156d1d34d3 (diff) | |
| download | qtwebkit-79a88444f611ce793d7548de5dc07f182b096054.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
Source/sync.profile
Change-Id: I4dfbb7b37e49ca56dfd7b97fc3e900dd6fdd0625
Diffstat (limited to 'Source/JavaScriptCore')
| -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 |