From 6da40bf3d504020da4394cd2509ad988e5e81ab6 Mon Sep 17 00:00:00 2001 From: "hausmann@webkit.org" Date: Wed, 27 Feb 2013 12:05:56 +0000 Subject: Fix massive parallel builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- Source/JavaScriptCore/LLIntOffsetsExtractor.pro | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Source/JavaScriptCore/LLIntOffsetsExtractor.pro') 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 -- cgit v1.2.1