Changeset 61536 in webkit

Timestamp:

Jun 21, 2010 2:40:08 AM (14 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

[Qt] Work around a build problem with libjscore on Symbian.
​https://bugs.webkit.org/show_bug.cgi?id=40840

Reviewed by Simon Hausmann.

Sbsv2 sometimes have problems with debug/release configuration
determination causing QtWebKit in release to try linking with the debug
JavaScriptCore static library. This patch limit the jscore/jscored
r58306 fix necessary for mac builds only to the mac platform to prevent the
different name problem.

The real fix would be to fix qmake or the toolchain, this patch might
help meanwhile.

• JavaScriptCore.pri:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.pri (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-06-18  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Work around a build problem with libjscore on Symbian.
+        https://bugs.webkit.org/show_bug.cgi?id=40840
+
+        Sbsv2 sometimes have problems with debug/release configuration
+        determination causing QtWebKit in release to try linking with the debug
+        JavaScriptCore static library. This patch limit the jscore/jscored
+        r58306 fix necessary for mac builds only to the mac platform to prevent the
+        different name problem.
+
+        The real fix would be to fix qmake or the toolchain, this patch might
+        help meanwhile.
+
+        * JavaScriptCore.pri:
+
 2010-06-21  Patrick Gansterer  <paroga@paroga.com>
 

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -4 +4 @@
 
 VPATH += $$PWD
-!CONFIG(release, 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
-}
+
+# Use a config-specific target to prevent parallel builds file clashes on Mac
+mac: CONFIG(debug, debug|release): JAVASCRIPTCORE_TARGET = jscored
+else: JAVASCRIPTCORE_TARGET = jscore
+
+# Output in JavaScriptCore/<config>
+CONFIG(debug, debug|release) : JAVASCRIPTCORE_DESTDIR = debug
+else: JAVASCRIPTCORE_DESTDIR = release
+
 CONFIG(standalone_package) {
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/generated