Skip to content

Commit

Permalink
add api version into target triple for linking
Browse files Browse the repository at this point in the history
  • Loading branch information
tantaman committed Aug 21, 2023
1 parent 09596bf commit f42b99d
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions core/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,9 @@ NDK_HOSTARCH=linux-x86_64
# NDK_HOSTARCH=darwin-x86_64
CC=$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/bin/clang
rs_ndk=ndk -t $(ANDROID_TARGET)
# unset rs target?
ANDROID_API_VERSION=33
rs_build_flags=-Zbuild-std
sysroot_option=--sysroot=$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot
# android_I = -I$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot/usr/include/$(ANDROID_TARGET)/asm
# android_L = -L$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot/usr/lib/$(ANDROID_TARGET)/33
endif

prefix=./dist
Expand Down Expand Up @@ -142,7 +140,7 @@ ifdef CI_MAYBE_TARGET
ifndef CI_GCC
# clang has a different target triple than Rust for ios simuators
ifeq ($(findstring sim,$(CI_MAYBE_TARGET)),)
C_TARGET = --target=$(CI_MAYBE_TARGET)
C_TARGET = --target=$(CI_MAYBE_TARGET)$(ANDROID_API_VERSION)
else
C_TARGET = --target=$(CI_MAYBE_TARGET)ulator
endif
Expand Down

0 comments on commit f42b99d

Please sign in to comment.