Skip to content

Commit

Permalink
[mmp] Remove duplicate libmono-system-native.a logic
Browse files Browse the repository at this point in the history
- xamarin#4980 and the mono branch merge both added it
- However both copies were not the same, one was conditional and one added an extra -u option
- This collapses them into one check
  • Loading branch information
chamons committed Nov 1, 2018
1 parent f389c03 commit 940b846
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions tools/mmp/driver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1358,12 +1358,10 @@ static int Compile ()

// libmono-system-native.a needs to be included if it exists in the mono in question
string libmonoNative = Path.Combine (libdir, "libmono-system-native.a");
if (File.Exists (libmonoNative))
if (File.Exists (libmonoNative)) {
args.Append (StringUtils.Quote (libmonoNative)).Append (' ');

var libsystem_native_path = Path.Combine (libdir, "libmono-system-native.a");
args.Append (StringUtils.Quote (libsystem_native_path)).Append (' ');
args.Append ("-u ").Append ("_SystemNative_RealPath").Append (' '); // This keeps libmono_system_native_la-pal_io.o symbols
args.Append ("-u ").Append ("_SystemNative_RealPath").Append (' '); // This keeps libmono_system_native_la-pal_io.o symbols
}

if (profiling.HasValue && profiling.Value) {
args.Append (StringUtils.Quote (Path.Combine (libdir, "libmono-profiler-log.a"))).Append (' ');
Expand Down

0 comments on commit 940b846

Please sign in to comment.