diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 22:06:35 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 22:06:35 +0000 |
| commit | d26b4418ab4d417e87b1d3fd5367dea0cf978a7c (patch) | |
| tree | c5a1bc90b6ea4574eb4428325637c8430259debf /build | |
| parent | c422c9199cfaff70b58abdb12d8d0e5b6bcd8101 (diff) | |
| download | chromium_src-d26b4418ab4d417e87b1d3fd5367dea0cf978a7c.zip chromium_src-d26b4418ab4d417e87b1d3fd5367dea0cf978a7c.tar.gz chromium_src-d26b4418ab4d417e87b1d3fd5367dea0cf978a7c.tar.bz2 | |
Fix some gyp errors found with --check.
Running check will error out until NaCl problems are fixed (CL pending).
TEST=src/build/gyp_chromium --check
Review URL: http://codereview.chromium.org/1239002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 5ebbfc8..cd20d4b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -544,17 +544,12 @@ 'msvs_settings': { 'VCLinkerTool': { 'TargetMachine': '17', # x86 - 64 - }, - }, - 'msvs_settings': { - 'VCLibrarianTool': { 'AdditionalLibraryDirectories!': ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], 'AdditionalLibraryDirectories': ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'], }, - 'VCLinkerTool': { - 'TargetMachine': '17', + 'VCLibrarianTool': { 'AdditionalLibraryDirectories!': ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], 'AdditionalLibraryDirectories': |