Skip to content

Commit 84952df

Browse files
committed
Revert "[mono-runtimes] Try to download Mono archive before building mono (#2265)"
This reverts commit f970cd5. Unfortunately, it [broke the build][0]: libtool: error: Could not determine the host path corresponding to libtool: error: Could not determine the host path corresponding to libtool: error: '/Users/builder/jenkins/workspace/xamarin-android/xamarin-android/external/mono/sdks/builds/android-host-mxe-Win64-debug/mono/mini/.libs' libtool: error: '/Users/builder/jenkins/workspace/xamarin-android/xamarin-android/external/mono/sdks/builds/android-host-mxe-Win64-debug/mono/mini/.libs' libtool: error: Continuing, but uninstalled executables may not work. Looks like the MXE+Windows build side was broken. :-( Revert commit f970cd5 until we figure things out. [0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/1207/
1 parent d4fb5e5 commit 84952df

File tree

4 files changed

+75
-84
lines changed

4 files changed

+75
-84
lines changed

build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitHash.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ public sealed class GitCommitHash : Git
1616
[Output]
1717
public string AbbreviatedCommitHash { get; set; }
1818

19-
[Output]
20-
public string CommitHash { get; set; }
21-
2219
protected override bool LogTaskMessages {
2320
get { return false; }
2421
}
@@ -41,18 +38,17 @@ public override bool Execute ()
4138

4239
protected override string GenerateCommandLineCommands ()
4340
{
44-
return "rev-parse HEAD";
41+
return "log --no-color --first-parent -n1 --pretty=format:%h";
4542
}
4643

4744
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
4845
{
4946
if (string.IsNullOrEmpty (singleLine))
5047
return;
51-
if (singleLine.Length < 40) {
52-
Log.LogError ("Commit hash `{0}` is shorter than required length of {1} characters", singleLine, 40);
48+
if (singleLine.Length < RequiredHashLength) {
49+
Log.LogError ("Abbreviated commit hash `{0}` is shorter than required length of {1} characters", singleLine, RequiredHashLength);
5350
return;
5451
}
55-
CommitHash = singleLine;
5652
AbbreviatedCommitHash = singleLine.Substring (0, RequiredHashLength);
5753
}
5854
}

src/mono-runtimes/mono-runtimes.projitems

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
4-
<_MonoBcl Include="bcl" />
5-
</ItemGroup>
6-
73
<ItemGroup>
84
<_MonoRuntime Include="armeabi-v7a" Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:')) ">
95
<Strip>$(AndroidToolchainDirectory)\toolchains\armeabi-v7a-clang\bin\arm-linux-androideabi-strip</Strip>
@@ -64,16 +60,27 @@
6460
<OutputMonoBtlsFilename></OutputMonoBtlsFilename>
6561
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
6662
</_MonoRuntime>
67-
<_MonoRuntime Include="host-$(HostOS)" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':$(HostOS):')) And ( '$(HostOS)' == 'Darwin' Or '$(HostOS)' == 'Linux' )">
63+
<_MonoRuntime Include="host-Darwin" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">
64+
<Strip>strip</Strip>
65+
<StripFlags>-S</StripFlags>
66+
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
67+
<NativeLibraryExtension>dylib</NativeLibraryExtension>
68+
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
69+
<OutputAotProfilerFilename>libmono-profiler-aot</OutputAotProfilerFilename>
70+
<OutputMonoBtlsFilename></OutputMonoBtlsFilename>
71+
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
72+
<BuildTests>True</BuildTests>
73+
</_MonoRuntime>
74+
<_MonoRuntime Include="host-Linux" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">
6875
<Strip>strip</Strip>
6976
<StripFlags>-S</StripFlags>
7077
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
71-
<NativeLibraryExtension Condition=" '$(HostOS)' == 'Darwin' ">dylib</NativeLibraryExtension>
72-
<NativeLibraryExtension Condition=" '$(HostOS)' == 'Linux' ">so</NativeLibraryExtension>
78+
<NativeLibraryExtension>so</NativeLibraryExtension>
7379
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
7480
<OutputAotProfilerFilename>libmono-profiler-aot</OutputAotProfilerFilename>
7581
<OutputMonoBtlsFilename></OutputMonoBtlsFilename>
7682
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
83+
<BuildTests>True</BuildTests>
7784
</_MonoRuntime>
7885
</ItemGroup>
7986

@@ -84,13 +91,15 @@
8491
<InstallBinaries>true</InstallBinaries>
8592
<InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">Darwin/</InstallPath>
8693
<InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">Linux/</InstallPath>
94+
<PackageOptions>llvm-llvm32_CC="$(HostCc32)" llvm-llvm32_CXX="$(HostCxx32)"</PackageOptions>
8795
</_LlvmRuntime>
8896

8997
<_LlvmRuntime Include="llvm64" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':arm64:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':x86_64:'))) And '$(HostBits)' == '64' ">
9098
<ExeSuffix></ExeSuffix>
9199
<InstallBinaries>true</InstallBinaries>
92100
<InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">Darwin/</InstallPath>
93101
<InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">Linux/</InstallPath>
102+
<PackageOptions>llvm-llvm64_CC="$(HostCc64)" llvm-llvm64_CXX="$(HostCxx64)"</PackageOptions>
94103
</_LlvmRuntime>
95104

96105
<_LlvmRuntime Include="llvmwin32" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi-v7a:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86:'))) ">

0 commit comments

Comments
 (0)