summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-04-29 09:05:06 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-04-29 14:42:39 +0000
commitd0eba497c1c34d35ddda2b5d44902ebd636d4f9e (patch)
treed8a40b262d6ca08cbc911bf98c3214a99c0f9c53
parent1b4ce37371252d54ddd08c0e5325d0385217ef26 (diff)
configure: Change default of CFG_REDUCE_RELOCATIONS to "no".
Suppress QMAKE_LFLAGS_BSYMBOLIC_FUNC (-Bsymbolic-functions for g++) by default since it causes crashes with gcc 5.X. Since applications compiled with gcc 5.X might run against Qt compiled with gcc 4.9.X and CLANG might also be affected, turn it off by default. Task-number: QTBUG-45755 Change-Id: I5704c3156db6b6f74e1c14576e5d02bcbd3082a4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
-rwxr-xr-xconfigure2
-rw-r--r--tools/configure/configureapp.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 6ce6753e3f..15a75bbccd 100755
--- a/configure
+++ b/configure
@@ -674,7 +674,7 @@ CFG_SSE4_1=auto
CFG_SSE4_2=auto
CFG_AVX=auto
CFG_AVX2=auto
-CFG_REDUCE_RELOCATIONS=auto
+CFG_REDUCE_RELOCATIONS=no
CFG_ACCESSIBILITY=auto
CFG_ACCESSIBILITY_ATSPI_BRIDGE=no # will be enabled depending on dbus and accessibility being enabled
CFG_NEON=auto
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 6e9d4aa80b..db0791b75c 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1696,7 +1696,7 @@ void Configure::applySpecSpecifics()
dictionary[ "LARGE_FILE" ] = "no";
dictionary[ "ANGLE" ] = "no";
dictionary[ "DYNAMICGL" ] = "no";
- dictionary[ "REDUCE_RELOCATIONS" ] = "yes";
+ dictionary[ "REDUCE_RELOCATIONS" ] = "no";
dictionary[ "QT_GETIFADDRS" ] = "no";
dictionary[ "QT_XKBCOMMON" ] = "no";
dictionary["ANDROID_STYLE_ASSETS"] = "yes";