Skip to content

Commit

Permalink
[mmp] Remove duplicate libmono-system-native.a logic (#5073)
Browse files Browse the repository at this point in the history
- #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 authored Nov 2, 2018
1 parent 8339b00 commit 366281e
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

3 comments on commit 366281e

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build was (probably) aborted

🔥 Jenkins job (on internal Jenkins) failed in stage(s) 'Package XM tests, Test run' 🔥 : hudson.AbortException: script returned exit code 2

Build succeeded
API Diff (from stable)
ℹ️ API Diff (from PR only) (please review changes)
Generator Diff (no change)
🔥 Test run failed 🔥

Test results

1 tests failed, 0 tests skipped, 225 tests passed.

Failed tests

  • System/Mac/Full: Failed (Test run failed.)

@rolfbjarne
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rolfbjarne
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting state to success where context is continuous-integration/jenkins/branch.

No blocking issues found

Please sign in to comment.