summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2012-06-08 11:02:49 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-06-24 18:36:42 (GMT)
commit39092105c93e63e92f8f543af953bcf9f4ebddce (patch)
tree7777dc1dbccf326ef4354c45b5171e369a407d31
parent97a4843c61a4f0829f4b18dec2b98c51a3d67ab2 (diff)
downloadQt-39092105c93e63e92f8f543af953bcf9f4ebddce.zip
Qt-39092105c93e63e92f8f543af953bcf9f4ebddce.tar.gz
Qt-39092105c93e63e92f8f543af953bcf9f4ebddce.tar.bz2
Fix compile issue on AIX
Since local thread storage is used we need to turn this on for the xlc compiler with the -qtls flag. Change-Id: Ib40ec87edada56a062b0c72b7d47b38a6d0b5b13 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit ef459193ec927f347a2c91b180994428c6ea1a97)
-rw-r--r--mkspecs/aix-xlc-64/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index 486b8c6..5876cef 100644
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -22,7 +22,7 @@ QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB =
QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
QMAKE_CFLAGS_YACC =
-QMAKE_CFLAGS_THREAD = -qthreaded
+QMAKE_CFLAGS_THREAD = -qthreaded -qtls
QMAKE_CXX = xlC
QMAKE_CXX_THREAD = xlC_r