diff options
author | Alexis Christoforides <alexis@thenull.net> | 2015-12-17 21:44:56 +0300 |
---|---|---|
committer | Alexis Christoforides <alexis@thenull.net> | 2015-12-17 21:44:56 +0300 |
commit | 3e40c70cf4510a02e8deb6ca3076a07df1a3aab2 (patch) | |
tree | e944d4156bd0a998dcf09cf7a57e1b6d42fdccc1 /mcs | |
parent | f663abeaf119727b3c56891dfce29ea0406d68b9 (diff) | |
parent | c010d577b64863bbf1665a85d4bfec4d6314d653 (diff) |
Merge pull request #2342 from lewurm/mkbundlefix
[mkbundle] restore old behavior of -c flag
Diffstat (limited to 'mcs')
-rwxr-xr-x | mcs/tools/mkbundle/mkbundle.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs index 3b3774c5725..89bab52384c 100755 --- a/mcs/tools/mkbundle/mkbundle.cs +++ b/mcs/tools/mkbundle/mkbundle.cs @@ -467,15 +467,16 @@ void mono_register_config_for_assembly (const char* assembly_name, cons tc.Close (); + string assembler = GetEnv("AS", "as"); + string as_cmd = String.Format("{0} -o {1} {2} ", assembler, temp_o, temp_s); + Execute(as_cmd); + if (compile_only) return; Console.WriteLine("Compiling:"); if (style == "windows") { - string assembler = GetEnv("AS", "as"); - string as_cmd = String.Format("{0} -o {1} {2} ", assembler, temp_o, temp_s); - Execute(as_cmd); Func<string, string> quote = (pp) => { return "\"" + pp + "\""; }; @@ -514,13 +515,10 @@ void mono_register_config_for_assembly (const char* assembly_name, cons } else { - string assembler = GetEnv("AS", "as"); - string cmd = String.Format("{0} -o {1} {2} ", assembler, temp_o, temp_s); - Execute(cmd); - string zlib = (compress ? "-lz" : ""); string debugging = "-g"; string cc = GetEnv("CC", "cc"); + string cmd = null; if (style == "linux") debugging = "-ggdb"; @@ -745,7 +743,7 @@ void mono_register_config_for_assembly (const char* assembly_name, cons static void Execute (string cmdLine) { if (IsUnix) { - Console.WriteLine (cmdLine); + Console.WriteLine ("[execute cmd]: " + cmdLine); int ret = system (cmdLine); if (ret != 0) { |