Changeset 79320 in webkit for trunk/Source/JavaScriptCore/JavaScriptCore.pri

Timestamp:

Feb 22, 2011, 7:14:57 AM (15 years ago)

Author:

[email protected]

Message:

2011-02-22 Andras Becsi <​[email protected]>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

• Source/WebKit.pri: Add common include paths
• Source/WebKit.pro: Add new project file to SUBDIRS

2011-02-22 Andras Becsi <​[email protected]>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

• WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro: Remove superfluous includepaths.

2011-02-22 Andras Becsi <​[email protected]>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

• JavaScriptCore.pri: Remove the workaround.

2011-02-22 Andras Becsi <​[email protected]>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

• QtWebKit.pro: Added. Project file for the final build step.

2011-02-22 Andras Becsi <​[email protected]>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

No new tests needed.

• WebCore.pri: Add needed rules for handling the static library.
• WebCore.pro: Reorganize API and linker options to QtWebKit.pro.

2011-02-22 Andras Becsi <​[email protected]>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

• WebKit2.pri: Add include paths.
• WebKit2.pro: Move include paths to WebKit2.pri and move the API source to WebKit/qt/QtWebKit.pro

File:

• trunk/Source/JavaScriptCore/JavaScriptCore.pri (modified) (1 diff)

trunk/Source/JavaScriptCore/JavaScriptCore.pri

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