Changeset 76263 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Jan 20, 2011, 10:13:55 AM (14 years ago)

Author:

[email protected]

Message:

2011-01-20 Andras Becsi <​[email protected]>

Reviewed by Csaba Osztrogonác.

[Qt][WK2] WebKit2 enabled build fails to link

Work around undefined reference linking issues until the buildsystem gets redesigned.
These issues first occured in minimal builds (see BUG 50519).

• JavaScriptCore.pri: link as whole-archive for WebKit2 builds

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-20  Andras Becsi  <[email protected]>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt][WK2] WebKit2 enabled build fails to link
+
+        Work around undefined reference linking issues until the buildsystem gets redesigned.
+        These issues first occured in minimal builds (see BUG 50519).
+
+        * JavaScriptCore.pri: link as whole-archive for WebKit2 builds
+
 2011-01-20  Zoltan Horvath  <[email protected]>
 

trunk/Source/JavaScriptCore/JavaScriptCore.pri

@@ -89 +89 @@
         # that can't resolve symbols from QtCore if libjscore comes after.
         QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR
-        LIBS += -l$$JAVASCRIPTCORE_TARGET
+        webkit2 {
+            # FIXME Workaround for undefined reference linking issues until the build system gets redesigned
+            LIBS += -Wl,-whole-archive -l$$JAVASCRIPTCORE_TARGET -Wl,-no-whole-archive
+        } else {
+            LIBS += -l$$JAVASCRIPTCORE_TARGET
+        }
         POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a
     }