Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(364)

Issue 68133006: win: Add support for TargetMachine in VCLibrarianTool section (Closed)

Created:
7 years, 1 month ago by scottmg
Modified:
7 years, 1 month ago
Reviewers:
Nico
CC:
gyp-developer_googlegroups.com
Visibility:
Public.

Description

win: Add support for TargetMachine in VCLibrarianTool section remoting_host_event_logger.lib was built from one .rc file and one .cc. If unspecified, lib.exe appears to choose the architecture from the first input file. As a compiled .res doesn't have an architecture, it bailed and selected X64 (because the 2013 lib.exe is x64 host, I guess). Resulting in: FAILED: E:\b\depot_tools\python_bin\python.exe gyp-win-tool link-wrapper environment.x86 lib.exe /nologo /ignore:4221 /OUT:obj\remoting\remoting_host_event_logger.lib @obj\remoting\remoting_host_event_logger.lib.rsp LINK : warning LNK4068: /MACHINE not specified; defaulting to X64 obj\remoting\host\remoting_host_event_logger.host_event_logger_win.obj : fatalerror LNK1112: module machine type 'X86' conflicts with target machine type 'x64' VCLibrarianTool supports TargetMachine the same as VCLinkerTool, but we'd never used it before. Add support to the ninja/msvs generator, and add a test for it. R=thakis@chromium.org BUG=309197 Committed: https://code.google.com/p/gyp/source/detail?r=1785

Patch Set 1 #

Patch Set 2 : add comment #

Unified diffs Side-by-side diffs Delta from patch set Stats (+41 lines, -22 lines) Patch
M pylib/gyp/MSVSSettings.py View 2 chunks +1 line, -1 line 0 comments Download
M pylib/gyp/msvs_emulation.py View 1 chunk +1 line, -0 lines 0 comments Download
A test/win/gyptest-link-target-machine.py View 1 1 chunk +28 lines, -0 lines 0 comments Download
A + test/win/linker-flags/target-machine.gyp View 1 chunk +11 lines, -21 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
scottmg
7 years, 1 month ago (2013-11-12 06:11:40 UTC) #1
Nico
lgtm!
7 years, 1 month ago (2013-11-12 06:21:55 UTC) #2
scottmg
7 years, 1 month ago (2013-11-12 06:54:18 UTC) #3
Message was sent while issue was closed.
Committed patchset #2 manually as r1785.

Powered by Google App Engine
This is Rietveld 408576698