diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | gn/toolchain/BUILD.gn | 8 |
2 files changed, 7 insertions, 2 deletions
@@ -49,3 +49,4 @@ Christian Plesner Hansen <plesner@t.undra.org> Marco Alesiani <marco.diiga@gmail.com> Adobe Systems Incorporated <*@adobe.com> Yandex LLC <*@yandex-team.ru> +Kaloyan Donev <kdonev@gmail.com>
\ No newline at end of file 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", ] |