Changeset 51110 in webkit for trunk/JavaScriptCore/JavaScriptCore.pri

Timestamp:

Nov 18, 2009, 5:22:11 AM (16 years ago)

Author:

Simon Hausmann

Message:

[Qt] Fix detection of linux-g++

Patch by Harald Fernengel <​[email protected]> on 2009-11-18
Reviewed by Simon Hausmann.

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.

• JavaScriptCore.pri:

File:

• trunk/JavaScriptCore/JavaScriptCore.pri (modified) (1 diff)

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -60 +60 @@
 # 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