Skip to content

Commit 9c1c5de

Browse files
jkurdekgithub-actions
authored andcommitted
Allowed overwriting AsOptions
1 parent 9166c64 commit 9c1c5de

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
@@ -133,6 +133,7 @@
133133
</PropertyGroup>
134134

135135
<PropertyGroup>
136+
<_AsOptions>-target $(_Triple) -c -x assembler</_AsOptions>
136137
<_LdName>clang</_LdName>
137138
<_LdOptions>-fuse-ld=lld</_LdOptions>
138139
<_AsName>clang</_AsName>
@@ -230,7 +231,7 @@
230231
<MonoAOTCompiler
231232
AotModulesTablePath="$(_AotModuleTablePath)"
232233
AsName="$(_AsName)"
233-
AsOptions="-target $(_Triple) -c -x assembler"
234+
AsOptions="$(_AsOptions)"
234235
Assemblies="@(_AotInputAssemblies)"
235236
CompilerBinaryPath="$(_CompilerBinaryPath)"
236237
DirectPInvokes="@(DirectPInvokes)"

src/mono/sample/Android/AndroidSampleApp.csproj

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

8585
<PropertyGroup>
86+
<_AsOptions>-target $(_Triple) -c -x assembler</_AsOptions>
8687
<_LdName>clang</_LdName>
8788
<_LdOptions>-fuse-ld=lld</_LdOptions>
8889
<_AsName>clang</_AsName>
@@ -91,7 +92,7 @@
9192
<MonoAOTCompiler Condition="'$(ForceAOT)' == 'true'"
9293
AotModulesTablePath="$(_AotModulesTablePath)"
9394
AsName="$(_AsName)"
94-
AsOptions="-target $(_Triple) -c -x assembler"
95+
AsOptions="$(_AsOptions)"
9596
Assemblies="@(AotInputAssemblies)"
9697
CompilerBinaryPath="@(MonoAotCrossCompiler->WithMetadataValue('RuntimeIdentifier','$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())'))"
9798
IntermediateOutputPath="$(IntermediateOutputPath)"

0 commit comments

Comments
 (0)