summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-04-19 16:54:26 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-19 17:13:43 +0200
commit05d48138c82ddf6b0f070c8216cb8e2c245bb969 (patch)
treedca33caa854d5135b6758d61807bdbea71296a84
parent47321e6369f34d29b5126e260b413a04ff62ab30 (diff)
downloadqtwebkit-05d48138c82ddf6b0f070c8216cb8e2c245bb969.tar.gz
[Qt] Only use thin archives on Linux
http://trac.webkit.org/changeset/148744 Rubber-stamped by Jocelyn Turcotte. Since "thin archive" is a feature of GNU's ar we limit the usage to Linux to avoid problems with other configurations (eg. macx-g++). Change-Id: I80fff0c518f4e504f05f88c0d269cffae906d9e6 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--Tools/qmake/mkspecs/features/default_pre.prf3
1 files changed, 2 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
index c0f21610f..57513accc 100644
--- a/Tools/qmake/mkspecs/features/default_pre.prf
+++ b/Tools/qmake/mkspecs/features/default_pre.prf
@@ -88,7 +88,8 @@ CONFIG += include_webinspector
# used by bots and developers, will disable it, to enable warnings etc.
CONFIG += production_build
-!debug_and_release:*-g++*: CONFIG += gnu_thin_archives
+# Limit the creation of thin archives to Linux, since only GNU's ar supports it.
+!debug_and_release:linux-g++*: CONFIG += gnu_thin_archives
# Pick up Qt's defaults for debug/release/debug_and_release
if(win32|mac):!macx-xcode {