Index: toolchain_build/toolchain_build_pnacl.py |
diff --git a/toolchain_build/toolchain_build_pnacl.py b/toolchain_build/toolchain_build_pnacl.py |
index f2c5ea20438169d753f8d006eaafbaf4a2a893e8..431017b8f877d77e9c75b65a47288d6a2258b6a5 100755 |
--- a/toolchain_build/toolchain_build_pnacl.py |
+++ b/toolchain_build/toolchain_build_pnacl.py |
@@ -233,11 +233,6 @@ 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%(' + FlavoredName('abs_libcxx', |