Index: toolchain_build/toolchain_build_pnacl.py |
diff --git a/toolchain_build/toolchain_build_pnacl.py b/toolchain_build/toolchain_build_pnacl.py |
index 6a0eb21f667250daa059345858110bb6d1ad315e..c5f54973f6a520b4312b063e00f3d5d492822f42 100755 |
--- a/toolchain_build/toolchain_build_pnacl.py |
+++ b/toolchain_build/toolchain_build_pnacl.py |
@@ -225,6 +225,11 @@ def ConfigureHostArchFlags(host, extra_cflags, options, extra_configure=None): |
configure_args.extend(['CFLAGS=' + ' '.join(extra_cflags), |
'CXXFLAGS=' + ' '.join(extra_cflags)]) |
else: |
+ # TODO(jvoung): Remove this after merging LLVM to be cleaner |
+ # w.r.t. -Winconsistent-missing-override. |
+ # https://code.google.com/p/nativeclient/issues/detail?id=4026 |
+ if not options.gcc: |
+ extra_cflags.append('-Wno-inconsistent-missing-override') |
configure_args.extend( |
['CFLAGS=' + ' '.join(extra_cflags), |
'LDFLAGS=-L%(' + GSDJoin('abs_libcxx', host) + ')s/lib', |