diff options
author | Alexis Christoforides <alexis@thenull.net> | 2015-12-17 21:43:57 +0300 |
---|---|---|
committer | Alexis Christoforides <alexis@thenull.net> | 2015-12-17 21:45:20 +0300 |
commit | 62eca45496cc2e6d91612ee1773b398866eba984 (patch) | |
tree | 08a7cbf94785f119deecc5a7360fc50b5510ad94 /mcs | |
parent | 48cf6194d0a7731210e09c29e4e9ebbe8df6358b (diff) |
[mkbundle] Correct some linking options for Windows
Diffstat (limited to 'mcs')
-rwxr-xr-x | mcs/tools/mkbundle/mkbundle.cs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs index e24b924e761..116ffd44cdc 100755 --- a/mcs/tools/mkbundle/mkbundle.cs +++ b/mcs/tools/mkbundle/mkbundle.cs @@ -493,15 +493,12 @@ void mono_register_config_for_assembly (const char* assembly_name, cons foreach (string include in includes) compilerArgs.Add(String.Format ("/I {0}", quote (include))); - if (static_link) { - compilerArgs.Add("/MT"); - monoFile = LocateFile (monoPath + @"\lib\mono-2.0.lib"); - } - else { - compilerArgs.Add("/MD"); - monoFile = LocateFile (monoPath + @"\lib\mono-2.0.dll"); - } + if (static_link) + monoFile = LocateFile (monoPath + @"\lib\monosgen-2.0.lib"); + else + monoFile = LocateFile (monoPath + @"\lib\monosgen-2.0dll"); + compilerArgs.Add("/MD"); compilerArgs.Add(temp_c); compilerArgs.Add(temp_o); compilerArgs.Add("/link"); |