diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2009-11-17 09:28:27 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2009-11-17 09:28:27 (GMT) |
| commit | 333bd2e761af8aaf6efd3d66eb028af046c4dfc2 (patch) | |
| tree | e691744c335fa62ab0d9175b3150fe3555a7a5bb /src/corelib | |
| parent | dd1ab7b8ed2c847d2ba3b19c007f545f6fb098df (diff) | |
| download | Qt-333bd2e761af8aaf6efd3d66eb028af046c4dfc2.zip Qt-333bd2e761af8aaf6efd3d66eb028af046c4dfc2.tar.gz Qt-333bd2e761af8aaf6efd3d66eb028af046c4dfc2.tar.bz2 | |
Fix detection of linux-g++
Never use "linux-g++*" to check for linux-g++, since this will break embedded
builds which use linux-arm-g++ and friends. Use 'linux*-g++*' to check for any
g++ on linux mkspec.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/global.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 0fe757d..b916b4d 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -19,7 +19,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global # Only used on platforms with CONFIG += precompile_header PRECOMPILED_HEADER = global/qt_pch.h -linux-g++*:!static { +linux*-g++*:!static { QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate prog=$$quote(if (/program interpreter: (.*)]/) { print $1; }) DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\" |