Skip to content

Commit 64286d4

Browse files
steveisokjkurdek
authored andcommitted
Since we bumped the NDK in dotnet/dotnet-buildtools-prereqs-docker#1278, libClang.so is no longer found in the place we expect. As a result, the android aot offsets won't be generated and the dedicated CI leg will fail.
This change fixes the path.
1 parent 9c1c5de commit 64286d4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/mono/mono.proj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,9 @@
688688

689689
<!-- Linux specific options -->
690690
<ItemGroup Condition="'$(AotHostOS)' == 'linux'">
691-
<_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib64/libclang.so.*"/>
691+
<_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib/libclang.so" Condition=" Exists('$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib/libclang.so') "/>
692+
<_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib64/libclang.so.*" Condition=" '@(_LibClang)' == '' "/>
693+
<_LibClang Include="/usr/local/lib/libclang.so" Condition="'@(_LibClang)' == ''" />
692694
</ItemGroup>
693695
<PropertyGroup Condition="'$(TargetsLinux)' == 'true' and '$(Platform)' == 'arm64'">
694696
<MonoUseCrossTool>true</MonoUseCrossTool>

0 commit comments

Comments
 (0)