diff options
author | Kaloyan Donev <kdonev@gmail.com> | 2018-03-16 14:45:35 +0200 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-19 15:20:35 +0000 |
commit | f7466bd84acd28594b3f4df47d91211d9508a16e (patch) | |
tree | a671e36d0f5ce24edcb45983e5c5185aad76d880 /gn/toolchain | |
parent | a3ecaf5fcfe9ce05fdc82bac4fcdecd045c9c265 (diff) |
Support x86 build with VS 2015
Pass extra assembler flags to the asm tool in msvc toolchain
My first commit so added my name to the AUTHORS file.
Change-Id: I19529a901be6d9c00df3c0880003be3363475c6e
Reviewed-on: https://skia-review.googlesource.com/114740
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'gn/toolchain')
-rw-r--r-- | gn/toolchain/BUILD.gn | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn index fd2aafa913..1c0c2dc56a 100644 --- a/gn/toolchain/BUILD.gn +++ b/gn/toolchain/BUILD.gn @@ -34,7 +34,11 @@ toolchain("msvc") { lib_dir_switch = "/LIBPATH:" if (msvc == 2015) { - bin = "$win_vc/bin/amd64" + if (target_cpu == "x86") { + bin = "$win_vc/bin" + } else { + bin = "$win_vc/bin/amd64" + } } else { bin = "$win_vc/Tools/MSVC/$win_toolchain_version/bin/HostX64/$target_cpu" } @@ -64,7 +68,7 @@ toolchain("msvc") { if (target_cpu == "x64") { _ml += "64" } - command = "$env_setup $bin/$_ml.exe /nologo /c /Fo {{output}} {{source}}" + command = "$env_setup $bin/$_ml.exe {{asmflags}} /nologo /c /Fo {{output}} {{source}}" outputs = [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", ] |