Skip to content

Commit be3007a

Browse files
committed
fix: android-x86 target not compiling
The android-x86 target is special in that it statically links to clang_rt.builtins. The path to these libraries were wrong, pointing to a non-exising directory in the android NDK. We fix it by starting from the `resource-dir` instead and navigate from there instead of `runtime-dir` which doesn't always point the right place on all platforms.
1 parent 8cbbb33 commit be3007a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ $(ANDROID_X86): $(android-x86-deps) | android-env
346346
$(CARGO_BUILD_ARGS) -- \
347347
-C strip=symbols \
348348
-l static=clang_rt.builtins-x86_64-android \
349-
-L $$($(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/$(PLATFORM_DIR)/bin/clang --print-runtime-dir)
349+
-L $$($(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/$(PLATFORM_DIR)/bin/clang --print-resource-dir)/lib/linux
350350

351351
.PHONY: android-x86
352352
android-x86: $(ANDROID_X86) ## Build core-crypto-ffi for x86_64-linux-android

0 commit comments

Comments
 (0)