diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-03-29 19:29:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-30 18:45:19 +0000 |
| commit | 5f80485a53e56e92d0914131b03ae33e49c163a8 (patch) | |
| tree | 9cfa8eeecf238efccfb0e8e60cc2accf106c9fc6 /gn/BUILD.gn | |
| parent | bcf35f86d50b784b165de703b404998dd4299f6a (diff) | |
make _win.S know if it's 64-bit
I think this is the root of my Windows / Chrome problems.
Even on 32-bit builds, Chrome compiles nacl64.exe in 64-bit mode.
So to make things simple, always put _win.S in the sources,
and no-op it away when assembling for 32-bit.
Change-Id: I19f163491739a6c0cbdedd0ce353f1d2289907ae
Reviewed-on: https://skia-review.googlesource.com/10637
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn/BUILD.gn')
| -rw-r--r-- | gn/BUILD.gn | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 30a8669808..52c13bf666 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -502,7 +502,11 @@ toolchain("msvc") { } tool("asm") { - command = "$env_setup$bin/ml64.exe /nologo /c /Fo {{output}} {{source}}" + _ml = "ml" + if (target_cpu == "x64") { + _ml += "64" + } + command = "$env_setup$bin/$_ml.exe /nologo /c /Fo {{output}} {{source}}" outputs = [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", ] |