Skip to content

Commit 0da130a

Browse files
Fix for building on macOS
* Set execute bit on AOT compilers * Use `%(FullPath)` where appropriate
1 parent da9dab3 commit 0da130a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

build-tools/create-packs/Directory.Build.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
<Copy SourceFiles="@(_WLTemplates)" DestinationFolder="$(DotNetPreviewPath)template-packs" />
120120
<ItemGroup>
121121
<_UnixExecutables Include="$(DotNetPreviewPath)packs\Microsoft.Android.Sdk.*\*\tools\$(HostOS)\**\*.*" />
122+
<_UnixExecutables Include="$(DotNetPreviewPath)packs\microsoft.netcore.app.runtime.aot.*.cross.*\*\tools\*.*" />
122123
<_FilesToTouch Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Workload.Android\**" />
123124
<_FilesToTouch Include="$(DotNetPreviewPath)packs\$([System.String]::Copy('%(_WLPacks.Filename)').Replace('.$(_WLPackVersion)', ''))\$(_WLPackVersion)\**" />
124125
<_FilesToTouch Include="$(DotNetPreviewPath)packs\$([System.String]::Copy('%(_AotPacks.Filename)').Replace('.$(MonoAOTCompilerVersion)', ''))\$(MonoAOTCompilerVersion)\**" />

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ For <MonoAOTCompiler/> usage, see:
2727
-->
2828
<ItemGroup>
2929
<_AotRuntimeIdentifiers Include="$([System.String]::Copy('%(_RIDs.Identity)').Replace('.21', ''))" />
30+
<_AotCompilerPaths Include="$(MSBuildThisFileDirectory)..\..\..\microsoft.netcore.app.runtime.aot.osx-x64.cross.%(_AotRuntimeIdentifiers.Identity)\$(MonoAOTCompilerVersion)\tools\mono-aot-cross" />
3031
</ItemGroup>
3132
<MonoAOTCompiler
3233
AotModulesTableLanguage="$(_AotModulesTableLanguage)"
3334
AotModulesTablePath="$(_AotModulesTablePath)"
3435
AotProfilePath="$(_AotProfilePath)"
35-
Assemblies="@(_ShrunkAssemblies)"
36-
CompilerBinaryPath="$(MSBuildThisFileDirectory)..\..\..\microsoft.netcore.app.runtime.aot.osx-x64.cross.%(_AotRuntimeIdentifiers.Identity)\$(MonoAOTCompilerVersion)\tools\mono-aot-cross"
36+
Assemblies="@(_ShrunkAssemblies->'%(FullPath)')"
37+
CompilerBinaryPath="%(_AotCompilerPaths.FullPath)"
3738
DisableParallelAot="$(_DisableParallelAot)"
3839
LLVMPath="$(_LLVMPath)"
3940
Mode="$(AndroidAotMode)"

0 commit comments

Comments
 (0)