Skip to content

Commit d65c618

Browse files
committed
--target vs -target
1 parent 8bfbfff commit d65c618

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

core/Makefile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@ endif
4242
# https://github.com/marketplace/actions/setup-android-ndk
4343
ifdef ANDROID_TARGET
4444
CI_MAYBE_TARGET=$(ANDROID_TARGET)
45-
NDK = $(ANDROID_NDK_HOME)
46-
NDK_HOSTARCH = linux-x86_64
47-
# NDK_HOSTARCH = darwin-x86_64
48-
CC = $(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/bin/clang
49-
rs_ndk = ndk -t $(ANDROID_TARGET)
45+
NDK=$(ANDROID_NDK_HOME)
46+
LOADABLE_EXTENSION=so
47+
# NDK_HOSTARCH = linux-x86_64
48+
NDK_HOSTARCH=darwin-x86_64
49+
CC=$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/bin/clang
50+
rs_ndk=ndk -t $(ANDROID_TARGET)
5051
# unset rs target?
51-
rs_build_flags = -Zbuild-std
52-
sysroot_option = --sysroot="$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot"
52+
rs_build_flags=-Zbuild-std
53+
sysroot_option=--sysroot=$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot
5354
# android_I = -I$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot/usr/include/$(ANDROID_TARGET)/asm
5455
# android_L = -L$(NDK)/toolchains/llvm/prebuilt/$(NDK_HOSTARCH)/sysroot/usr/lib/$(ANDROID_TARGET)/33
5556
endif
@@ -141,9 +142,9 @@ ifdef CI_MAYBE_TARGET
141142
ifndef CI_GCC
142143
# clang has a different target triple than Rust for ios simuators
143144
ifeq ($(findstring sim,$(CI_MAYBE_TARGET)),)
144-
C_TARGET = -target $(CI_MAYBE_TARGET)
145+
C_TARGET = --target=$(CI_MAYBE_TARGET)
145146
else
146-
C_TARGET = -target $(CI_MAYBE_TARGET)ulator
147+
C_TARGET = --target=$(CI_MAYBE_TARGET)ulator
147148
endif
148149
endif
149150
endif

0 commit comments

Comments
 (0)