From f7466bd84acd28594b3f4df47d91211d9508a16e Mon Sep 17 00:00:00 2001 From: Kaloyan Donev Date: Fri, 16 Mar 2018 14:45:35 +0200 Subject: 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 Commit-Queue: Mike Klein --- gn/toolchain/BUILD.gn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gn/toolchain') 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", ] -- cgit v1.2.3