Index: build/toolchain.gypi |
diff --git a/build/toolchain.gypi b/build/toolchain.gypi |
index 684db74d2bfbb4027bd5da2dfe29a2fc535ad6d5..c3b1de0a549e2596eacda057f6f8b9310a528faf 100644 |
--- a/build/toolchain.gypi |
+++ b/build/toolchain.gypi |
@@ -357,7 +357,7 @@ |
}, |
}], |
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
- or OS=="netbsd"', { |
+ or OS=="netbsd" or OS=="qnx"', { |
'conditions': [ |
[ 'v8_no_strict_aliasing==1', { |
'cflags': [ '-fno-strict-aliasing' ], |
@@ -368,7 +368,7 @@ |
'defines': [ '__C99FEATURES__=1' ], # isinf() etc. |
}], |
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
- or OS=="netbsd" or OS=="mac" or OS=="android") and \ |
+ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ |
(v8_target_arch=="arm" or v8_target_arch=="ia32" or \ |
v8_target_arch=="mipsel")', { |
# Check whether the host compiler and target compiler support the |
@@ -390,7 +390,7 @@ |
'clang%': 0, |
}, |
'conditions': [ |
- ['(OS!="android" or clang==1) and \ |
+ ['((OS!="android" and OS!="qnx") or clang==1) and \ |
nacl_target_arch!="nacl_x64"', { |
'cflags': [ '<(m32flag)' ], |
'ldflags': [ '<(m32flag)' ], |
@@ -504,7 +504,8 @@ |
}, |
}, |
'conditions': [ |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { |
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \ |
+ OS=="qnx"', { |
'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', |
'-Wnon-virtual-dtor', '-Woverloaded-virtual', |
'<(wno_array_bounds)' ], |