Skip to content

Commit f42b99d

Browse files
committed
add api version into target triple for linking
1 parent 09596bf commit f42b99d

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

core/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ NDK_HOSTARCH=linux-x86_64
4848
# NDK_HOSTARCH=darwin-x86_64
4949
CC=$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/bin/clang
5050
rs_ndk=ndk -t $(ANDROID_TARGET)
51-
# unset rs target?
51+
ANDROID_API_VERSION=33
5252
rs_build_flags=-Zbuild-std
5353
sysroot_option=--sysroot=$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot
54-
# android_I = -I$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot/usr/include/$(ANDROID_TARGET)/asm
55-
# android_L = -L$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot/usr/lib/$(ANDROID_TARGET)/33
5654
endif
5755

5856
prefix=./dist
@@ -142,7 +140,7 @@ ifdef CI_MAYBE_TARGET
142140
ifndef CI_GCC
143141
# clang has a different target triple than Rust for ios simuators
144142
ifeq ($(findstring sim,$(CI_MAYBE_TARGET)),)
145-
C_TARGET = --target=$(CI_MAYBE_TARGET)
143+
C_TARGET = --target=$(CI_MAYBE_TARGET)$(ANDROID_API_VERSION)
146144
else
147145
C_TARGET = --target=$(CI_MAYBE_TARGET)ulator
148146
endif

0 commit comments

Comments
 (0)