From ef355145c1a8cf3853276b1116ccdf4027da77ef Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Thu, 16 Dec 2021 23:26:19 +0100
Subject: [PATCH] Build fixes

---
 config-user.mk.acr         | 3 ++-
 sys/android-ndk-install.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config-user.mk.acr b/config-user.mk.acr
index 8482e5c4f2..61580a1b4f 100644
--- a/config-user.mk.acr
+++ b/config-user.mk.acr
@@ -28,7 +28,8 @@ endif
 
 MKPLUGINS=mk/stat.mk mk/sloc.mk
 
-COMPILER=@USERCC@
+USERCC=@USERCC@
+COMPILER=$(shell basename ${USERCC})
 DEBUGGER=@DEBUGGER@
 
 INSTALL_DIR=@INSTALL_DIR@
diff --git a/sys/android-ndk-install.sh b/sys/android-ndk-install.sh
index 0679e2dfe9..4854150e64 100755
--- a/sys/android-ndk-install.sh
+++ b/sys/android-ndk-install.sh
@@ -16,7 +16,7 @@ Darwin)
 esac
 
 API=28
-[ -z "$1" ] && API="$1"
+[ -n "$1" ] && API="$1"
 
 echo Downloading NDK $V...
 wget -c -q https://dl.google.com/android/repository/android-ndk-$V-$O-x86_64.zip