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

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.pro (modified) (2 diffs)

trunk/JavaScriptCore/JavaScriptCore.pro

@@ -9 +9 @@
 # which already exists as a directory
 TARGET = $$JAVASCRIPTCORE_TARGET
+DESTDIR = $$JAVASCRIPTCORE_DESTDIR
 QT += core
 QT -= gui
@@ -16 +17 @@
 contains(QT_CONFIG, embedded):CONFIG += embedded
 
-CONFIG(debug_and_release):CONFIG(debug, debug|release): DESTDIR = debug
-CONFIG(debug_and_release):CONFIG(release, debug|release): DESTDIR = release
-
-!CONFIG(QTDIR_build) {
+CONFIG(QTDIR_build) {
+    # Make sure we compile both debug and release on mac when inside Qt.
+    # This line was extracted from qbase.pri instead of including the whole file
+    win32|mac:!macx-xcode:CONFIG += debug_and_release
+} else {
     CONFIG(debug, debug|release) {
         OBJECTS_DIR = obj/debug