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

Timestamp:

Mar 9, 2009, 9:37:43 AM (16 years ago)

Author:

[email protected]

Message:

2009-03-09 Laszlo Gombos <Laszlo Gombos>

Reviewed by George Staikos.

​https://bugs.webkit.org/show_bug.cgi?id=24353
Allow to overrule default build options for Qt build.

• WebCore.pro: Allow to overrule ENABLE_VIDEO and ENABLE_NETSCAPE_PLUGIN_API
• JavaScriptCore.pri: Allow to overrule ENABLE_JIT

File:

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

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -15 +15 @@
 
 # Disable the JIT due to numerous observed miscompilations :(
-CONFIG(release):isEqual(QT_ARCH,i386) {
-     JIT_DEFINES = ENABLE_JIT ENABLE_WREC ENABLE_JIT_OPTIMIZE_CALL ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS ENABLE_JIT_OPTIMIZE_ARITHMETIC
-     # Require gcc >= 4.1
-     linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_VA_LIST
-         QMAKE_CXXFLAGS += -fno-stack-protector
-         QMAKE_CFLAGS += -fno-stack-protector
-     }
-     win32-msvc* {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_REGISTER
-     }
+!contains(DEFINES, ENABLE_JIT=.) {
+    CONFIG(release):isEqual(QT_ARCH,i386) {
+         JIT_DEFINES = ENABLE_JIT ENABLE_WREC ENABLE_JIT_OPTIMIZE_CALL ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS ENABLE_JIT_OPTIMIZE_ARITHMETIC
+         # Require gcc >= 4.1
+         linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
+             DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_VA_LIST
+             QMAKE_CXXFLAGS += -fno-stack-protector
+             QMAKE_CFLAGS += -fno-stack-protector
+         }
+         win32-msvc* {
+             DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_REGISTER
+         }
+    }
 }