From f8c885d697548cbef7ea544b8a84fdf6d4072aba Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 26 Mar 2015 04:18:00 -0400 Subject: [PATCH] [mkbundle] Use mingw assembler on windows. --- mcs/tools/mkbundle/mkbundle.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs index 5389235d141..2dc2bf799d9 100755 --- a/mcs/tools/mkbundle/mkbundle.cs +++ b/mcs/tools/mkbundle/mkbundle.cs @@ -411,9 +411,11 @@ void mono_register_config_for_assembly (const char* assembly_name, cons ts.WriteLine (); } ts.Close (); + + string assembler = GetEnv ("AS", IsUnix ? "as" : "i686-pc-mingw32-as"); Console.WriteLine ("Compiling:"); - string cmd = String.Format ("{0} -o {1} {2} ", GetEnv ("AS", "as"), temp_o, temp_s); + string cmd = String.Format ("{0} -o {1} {2} ", assembler, temp_o, temp_s); int ret = Execute (cmd); if (ret != 0){ Error ("[Fail]"); -- 2.25.1