summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-01-07 12:58:24 +0100
committerErik Verbruggen <erik.verbruggen@digia.com>2014-01-10 10:15:31 +0100
commit35e093ffbf8243399c3d817290ba8ae9e4f359a0 (patch)
treeeb98be3bc7888b331563804fdef912cf4b5666ed /src/plugins/projectexplorer
parent1f474a4259c1594e0d946794cc0e9cacc112769f (diff)
downloadqt-creator-35e093ffbf8243399c3d817290ba8ae9e4f359a0.tar.gz
Pass PIC/PIE options to gcc when asking for defines.
These influence the __PIC__ and __PIE__ macros. Change-Id: I7938a897584f49b6e1c4d66c6e69ec7adccf2ad6 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r--src/plugins/projectexplorer/gcctoolchain.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index f3dbef6285..11de8e27f2 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -403,7 +403,9 @@ QByteArray GccToolChain::predefinedMacros(const QStringList &cxxflags) const
|| a.startsWith(QLatin1String("-specs="))
|| a == QLatin1String("-ansi") || a == QLatin1String("-undef")
|| a.startsWith(QLatin1String("-D")) || a.startsWith(QLatin1String("-U"))
- || a == QLatin1String("-fopenmp") || a == QLatin1String("-Wno-deprecated"))
+ || a == QLatin1String("-fopenmp") || a == QLatin1String("-Wno-deprecated")
+ || a == QLatin1String("-fPIC") || a == QLatin1String("-fpic")
+ || a == QLatin1String("-fPIE") || a == QLatin1String("-fpie"))
arguments << a;
}
macros = gccPredefinedMacros(m_compilerCommand, reinterpretOptions(arguments),