Commit 30f524a6 authored by abecsi@webkit.org's avatar abecsi@webkit.org
Browse files

2011-01-20 Andras Becsi <abecsi@webkit.org>

        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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76263 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ab8d0167
2011-01-20 Andras Becsi <abecsi@webkit.org>
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 <zoltan@webkit.org>
 
Reviewed by Csaba Osztrogonác.
......
......@@ -88,7 +88,12 @@ defineTest(addJavaScriptCoreLib) {
# Make sure jscore will be early in the list of libraries to workaround a bug in MinGW
# 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
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment