Skip to content

Commit fc4b0c9

Browse files
authored
Corrected the path of android ndk toolchains for OSX platforms (#3574)
1 parent dfa64f2 commit fc4b0c9

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ HOST_PLATFORM_OS ?= WINDOWS
114114
PLATFORM_OS ?= WINDOWS
115115

116116
# Determine PLATFORM_OS when required
117-
ifeq ($(PLATFORM),$(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_DESKTOP_SDL PLATFORM_WEB))
117+
ifeq ($(PLATFORM),$(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_DESKTOP_SDL PLATFORM_WEB PLATFORM_ANDROID))
118118
# No uname.exe on MinGW!, but OS=Windows_NT on Windows!
119119
# ifeq ($(UNAME),Msys) -> Windows
120120
ifeq ($(OS),Windows_NT)
@@ -189,8 +189,12 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID)
189189
ANDROID_NDK ?= C:/android-ndk
190190
ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64
191191
else
192-
ANDROID_NDK ?= /usr/lib/android/ndk
193-
ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64
192+
ANDROID_NDK ?= /usr/lib/android/ndk
193+
ifeq ($(PLATFORM_OS), OSX)
194+
ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/darwin-x86_64
195+
else
196+
ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64
197+
endif
194198
endif
195199

196200
# NOTE: Sysroot can also be reference from $(ANDROID_NDK)/sysroot

0 commit comments

Comments
 (0)