diff options
| author | Gabor Ballabas <gaborb@inf.u-szeged.hu> | 2012-06-19 13:24:43 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 03:18:13 +0200 |
| commit | 8b92d770a007739e550a03ccfd8f87601ff97b88 (patch) | |
| tree | 8c9da80c926958cab3506847a20ae6a81a4bf6fb /src | |
| parent | 88cf9402e336fddeb673c92f3c14da47a9f8450b (diff) | |
Fix compile-time error macro when building with -fPIE
This macro causes a compile-time error using LLVM with Clang
when the target that includes qglobal.h is built with -fPIE.
Change-Id: I2e82e1a8feed9009c814f187b06501b26ea3b3b7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 38655f1776..93bdd3c03a 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1193,7 +1193,7 @@ Q_CORE_EXPORT int qrand(); # define Q_OF_ELF #endif -#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && !defined(__PIC__) +#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && !defined(__PIC__) && !defined(__PIE__) # error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\ "Compile your code with -fPIC or -fPIE." #endif |