Skip to content

Commit 09eeeb5

Browse files
jkurdekgithub-actions
authored and
github-actions
committed
Allowed overwriting AsOptions
1 parent b1daba3 commit 09eeeb5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/mono/msbuild/android/build/AndroidBuild.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
</PropertyGroup>
121121

122122
<PropertyGroup>
123+
<_AsOptions>-target $(_Triple) -c -x assembler</_AsOptions>
123124
<_LdName>clang</_LdName>
124125
<_LdOptions>-fuse-ld=lld</_LdOptions>
125126
<_AsName>clang</_AsName>
@@ -217,7 +218,7 @@
217218
<MonoAOTCompiler
218219
AotModulesTablePath="$(_AotModuleTablePath)"
219220
AsName="$(_AsName)"
220-
AsOptions="-target $(_Triple) -c -x assembler"
221+
AsOptions="$(_AsOptions)"
221222
Assemblies="@(_AotInputAssemblies)"
222223
CompilerBinaryPath="$(_CompilerBinaryPath)"
223224
DirectPInvokes="@(DirectPInvokes)"

src/mono/sample/Android/AndroidSampleApp.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
</PropertyGroup>
8383

8484
<PropertyGroup>
85+
<_AsOptions>-target $(_Triple) -c -x assembler</_AsOptions>
8586
<_LdName>clang</_LdName>
8687
<_LdOptions>-fuse-ld=lld</_LdOptions>
8788
<_AsName>clang</_AsName>
@@ -90,7 +91,7 @@
9091
<MonoAOTCompiler Condition="'$(ForceAOT)' == 'true'"
9192
AotModulesTablePath="$(_AotModulesTablePath)"
9293
AsName="$(_AsName)"
93-
AsOptions="-target $(_Triple) -c -x assembler"
94+
AsOptions="$(_AsOptions)"
9495
Assemblies="@(AotInputAssemblies)"
9596
CompilerBinaryPath="@(MonoAotCrossCompiler->WithMetadataValue('RuntimeIdentifier','$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())'))"
9697
IntermediateOutputPath="$(IntermediateOutputPath)"

0 commit comments

Comments
 (0)