From ace86dca159d50886be5bcff7abe72383cad9fde Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Thu, 7 May 2015 08:34:19 +0200
Subject: [PATCH] Revert "configure: Change default of CFG_REDUCE_RELOCATIONS
to "no"."
This reverts commit d0eba497c1c34d35ddda2b5d44902ebd636d4f9e.
A better fix is to use -fPIC instead of just -fPIE fo
-reduce-relocations.
Task-number: QTBUG-45755
Change-Id: I1759291b684fd76d4009e4be9ba1354eb056e659
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
configure | 2 +-
tools/configure/configureapp.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 15a75bbccda..6ce6753e3fa 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=no
+CFG_REDUCE_RELOCATIONS=auto
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 db0791b75ce..6e9d4aa80be 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" ] = "no";
+ dictionary[ "REDUCE_RELOCATIONS" ] = "yes";
dictionary[ "QT_GETIFADDRS" ] = "no";
dictionary[ "QT_XKBCOMMON" ] = "no";
dictionary["ANDROID_STYLE_ASSETS"] = "yes";
--
GitLab