Skip to content

Commit 576f3f5

Browse files
committed
test passing explicit target
1 parent b2c5f78 commit 576f3f5

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,14 @@
132132
<MonoAOTCompilerDefaultAotArguments Include="nrgctx-trampolines=31000" />
133133

134134
<MonoAOTCompilerDefaultAotArguments Include="as-name=clang"/>
135-
<MonoAOTCompilerDefaultAotArguments Include="as-options=-c -x assembler"/>
135+
<!-- <MonoAOTCompilerDefaultAotArguments Include="as-options=-c -x assembler"/> -->
136136
<MonoAOTCompilerDefaultAotArguments Include="ld-name=clang"/>
137137
<MonoAOTCompilerDefaultAotArguments Include="ld-options=-fuse-ld=lld"/>
138+
139+
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'arm'" Include="as-options=-target armv7-linux-gnueabi -c -x assembler"/>
140+
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'arm64'" Include="as-options=-target aarch64-linux-android -c -x assembler"/>
141+
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'x86'" Include="as-options=-target i686-linux-android -c -x assembler"/>
142+
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'x64'" Include="as-options=-target x86_64-linux-android -c -x assembler"/>
138143
</ItemGroup>
139144

140145
<PropertyGroup>

0 commit comments

Comments
 (0)