Changeset 58306 in webkit for trunk/JavaScriptCore/JavaScriptCore.pri

Timestamp:

Apr 27, 2010, 6:55:36 AM (15 years ago)

Author:

[email protected]

Message:

[Qt] Fix Mac build break.

Reviewed by Tor Arne Vestbø.

​https://bugs.webkit.org/show_bug.cgi?id=37867

• Make sure JavaScriptCore's debug_and_release config follows that of WebCore.
• Use different name for JavaScriptCore target in debug and release since they might be written in the same path at the same time on parallel builds
• Consolidate the DESTDIR determination logic in JavaScriptCore.pri

• JavaScriptCore.pri:
• JavaScriptCore.pro:

File:

• trunk/JavaScriptCore/JavaScriptCore.pri (modified) (2 diffs)

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -1 +1 @@
 # JavaScriptCore - Qt4 build info
 VPATH += $$PWD
-JAVASCRIPTCORE_TARGET = jscore
-
+CONFIG(debug, debug|release) {
+    # Output in JavaScriptCore/<config>
+    JAVASCRIPTCORE_DESTDIR = debug
+    # Use a config-specific target to prevent parallel builds file clashes on Mac
+    JAVASCRIPTCORE_TARGET = jscored
+} else {
+    JAVASCRIPTCORE_DESTDIR = release
+    JAVASCRIPTCORE_TARGET = jscore
+}
 CONFIG(standalone_package) {
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/generated
@@ -66 +73 @@
 
 defineTest(addJavaScriptCoreLib) {
-    pathToJavaScriptCoreOutput = $$ARGS
-    CONFIG(debug_and_release):CONFIG(debug, debug|release): pathToJavaScriptCoreOutput = $$pathToJavaScriptCoreOutput/debug
-    CONFIG(debug_and_release):CONFIG(release, debug|release): pathToJavaScriptCoreOutput = $$pathToJavaScriptCoreOutput/release
+    # Argument is the relative path to JavaScriptCore.pro's qmake output
+    pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR
 
     win32-msvc*|wince* {