diff options
| author | brucedawson <brucedawson@chromium.org> | 2014-11-01 01:46:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-01 08:47:00 +0000 |
| commit | 5fb6274c6cd7d57421799bf7ac90991fbcbd7d22 (patch) | |
| tree | 269a22f0c7d0ccac507414e960e73b60f077e246 /third_party/yasm | |
| parent | caf53360684a4617f2239cfbe51f7acfe0aeca58 (diff) | |
| download | chromium_src-5fb6274c6cd7d57421799bf7ac90991fbcbd7d22.zip chromium_src-5fb6274c6cd7d57421799bf7ac90991fbcbd7d22.tar.gz chromium_src-5fb6274c6cd7d57421799bf7ac90991fbcbd7d22.tar.bz2 | |
Disable /analyze for the libexif and yasm projects to hack around internal compiler errors
VC++ hits internal compiler errors on a source file in each of yasm and
libexif. This halts the build and prevents full analysis. Therefore this
change disables /analyze for those two projects, to increase total
coverage.
Also fix a typo in libexif's README.chromium
BUG=427616
Review URL: https://codereview.chromium.org/657883003
Cr-Commit-Position: refs/heads/master@{#302381}
Diffstat (limited to 'third_party/yasm')
| -rw-r--r-- | third_party/yasm/README.chromium | 5 | ||||
| -rw-r--r-- | third_party/yasm/yasm.gyp | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium index 8226f8b..56513f7 100644 --- a/third_party/yasm/README.chromium +++ b/third_party/yasm/README.chromium @@ -135,4 +135,7 @@ Instructions for recreating the yasm.gyp file. default. The yasm.gyp build patches this file before invoking it to allow specifying an output directory. - 10) If all that's is finished, attempt to build....and cross your fingers. + 10) Recreate the 'AdditionalOptions!': [ '/analyze' ] block so that VC++ + /analyze builds won't fail. + + 11) If all that's is finished, attempt to build....and cross your fingers. diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp index 78f1966..0c21b83 100644 --- a/third_party/yasm/yasm.gyp +++ b/third_party/yasm/yasm.gyp @@ -77,6 +77,21 @@ '-Wno-incompatible-pointer-types', ], }, + 'conditions': [ + ['OS=="win"', { + # As of VS 2013 Update 3, building this project with /analyze hits an + # internal compiler error on elf-x86-amd64.c in release builds with + # the amd64_x86 compiler. This halts the build and prevents subsequent + # analysis. Therefore, /analyze is disabled for this project. See this + # bug for details: + # https://connect.microsoft.com/VisualStudio/feedback/details/1014799/internal-compiler-error-when-using-analyze + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions!': [ '/analyze' ] + }, + }, + }], + ], 'sources': [ 'source/patched-yasm/frontends/yasm/yasm-options.c', 'source/patched-yasm/frontends/yasm/yasm.c', |