diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-04-18 13:14:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-19 17:13:21 +0200 |
| commit | 40edeaa8d852af7d9a1eb8cf39528a023a310c1d (patch) | |
| tree | 6c733b90ec0d5d6c2ca3b8164de0432877d5be54 /Source/JavaScriptCore/JavaScriptCore.pri | |
| parent | 6dbfbbccf4dc71756f59bb828a008cb96002e248 (diff) | |
| download | qtwebkit-40edeaa8d852af7d9a1eb8cf39528a023a310c1d.tar.gz | |
[Qt] Use GNU ar's thin archive format for intermediate static libs
https://bugs.webkit.org/show_bug.cgi?id=109052
http://trac.webkit.org/changeset/142088
Reviewed by Jocelyn Turcotte.
With debug builds we exceed the 4GiB limit of GNU ar when creating the WebCore
intermediate static library which results in build failure even with a x86_64
toolchain (http://sourceware.org/bugzilla/show_bug.cgi?id=14625).
When using a GNU toolchain we can use the thin archive format for these static
libraries which also has the benefit of not copying the object files, thus
drastically reducing disk usage and overall compile time.
Currently qmake does not support GNU ar's thin archive format so for
now we need to do the magic in the build system as a stopgap solution.
Adjust project files that used activeBuildConfig()
to use targetSubDir().
Change-Id: I68604d5fc6acc32d45a734271aa87bfa5a14647f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCore.pri')
| -rw-r--r-- | Source/JavaScriptCore/JavaScriptCore.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri index 859f4a20d..629a4838c 100644 --- a/Source/JavaScriptCore/JavaScriptCore.pri +++ b/Source/JavaScriptCore/JavaScriptCore.pri @@ -33,7 +33,7 @@ INCLUDEPATH += \ $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR # Pick up the right version of LLIntAssembly.h -macx:INCLUDEPATH+=$$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$activeBuildConfig() +macx:INCLUDEPATH+=$$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$targetSubDir() win32-*: LIBS += -lwinmm |