summaryrefslogtreecommitdiffstats
path: root/third_party/yasm
diff options
context:
space:
mode:
authorscottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 20:58:24 +0000
committerscottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 20:58:24 +0000
commitc54b41cb226d9f394b8a5eec80aff813ea51d71c (patch)
tree40fd86be89ee97a7c548a2301e0594678a9dfdb0 /third_party/yasm
parent028f27eeee2ae781334bcfe25061e8d73d4fb66a (diff)
downloadchromium_src-c54b41cb226d9f394b8a5eec80aff813ea51d71c.zip
chromium_src-c54b41cb226d9f394b8a5eec80aff813ea51d71c.tar.gz
chromium_src-c54b41cb226d9f394b8a5eec80aff813ea51d71c.tar.bz2
Retry of warnings-as-errors for Windows third_party.
Same as patch here: https://chromiumcodereview.appspot.com/10827429/ except that warnings as errors is off if buildtype=Official. The previous CL was OK everywhere that's visible on build.chromium.org including "Official" but fails on internal builds. R=thakis@chromium.org BUG=126483, 140121, 143877 Review URL: https://chromiumcodereview.appspot.com/10867058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm')
-rw-r--r--third_party/yasm/yasm.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp
index d981b50..9093600 100644
--- a/third_party/yasm/yasm.gyp
+++ b/third_party/yasm/yasm.gyp
@@ -71,6 +71,9 @@
'genstring',
're2c',
],
+ # Patch to fix posted upstream, but not yet merged.
+ # https://github.com/yasm/yasm/pull/64
+ 'msvs_disabled_warnings': [ 4018, 4090 ],
'sources': [
'source/patched-yasm/frontends/yasm/yasm-options.c',
'source/patched-yasm/frontends/yasm/yasm.c',