diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2009-11-17 09:28:27 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-19 02:40:12 (GMT) |
| commit | f68fa03ab06440d26b8e667fa3b65375d3fa0c00 (patch) | |
| tree | 0a88cc2321531288e8a68c00be3d72f87815458c /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | |
| parent | f5acbef2c9d7138bd7212198ad078b345e513dc2 (diff) | |
| download | Qt-f68fa03ab06440d26b8e667fa3b65375d3fa0c00.zip Qt-f68fa03ab06440d26b8e667fa3b65375d3fa0c00.tar.gz Qt-f68fa03ab06440d26b8e667fa3b65375d3fa0c00.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
(cherry picked from commit 333bd2e761af8aaf6efd3d66eb028af046c4dfc2)
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri index 8bd4225..bb531e5 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri @@ -54,7 +54,7 @@ win32-* { # Rules when JIT enabled (not disabled) !contains(DEFINES, ENABLE_JIT=0) { - linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) { + linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) { QMAKE_CXXFLAGS += -fno-stack-protector QMAKE_CFLAGS += -fno-stack-protector } |