diff --git a/libretro/Makefile b/libretro/Makefile
index 3158edb..d3e6cee 100644
--- a/libretro/Makefile
+++ b/libretro/Makefile
@@ -188,7 +188,7 @@ endif
 
 	DEFINES := -DIOS
 ifeq ($(platform),ios-arm64)
-    CC = cc -arch armv64 -isysroot $(IOSSDK)
+    CC = cc -arch arm64 -isysroot $(IOSSDK)
 else
     CC = cc -arch armv7 -isysroot $(IOSSDK)
 endif
@@ -326,7 +326,12 @@ else
    SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=$(CORE_DIR)/libretro/link.T -Wl,--no-undefined
 endif
 
+ifeq ($(STATIC_LINKING), 1)
+# For some reason libretro's buildbot expects the output to be at ./libretro/ for static targets
+BIN ?= $(realpath -m $(CORE_DIR)/libretro)
+else
 BIN ?= $(realpath -m $(CORE_DIR))
+endif
 override BIN := $(shell cd .. && realpath -m $(BIN))
 TARGET := $(BIN)/$(TARGET)
 
diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
index 8ac1b3b..d1b7f67 100644
--- a/libretro/jni/Android.mk
+++ b/libretro/jni/Android.mk
@@ -22,7 +22,9 @@ LOCAL_CFLAGS    := -std=c99 $(COREFLAGS) $(CFLAGS)
 LOCAL_LDFLAGS   := -Wl,-version-script=$(CORE_DIR)/libretro/link.T
 include $(BUILD_SHARED_LIBRARY)
 
-$(CORE_DIR)/libretro/%_boot.c: $(CORE_DIR)/build/bin/BootROMs/%_boot.bin
+override BOOTROMS_DIR := $(shell cd ../.. && realpath -m $(BOOTROMS_DIR))
+
+$(CORE_DIR)/libretro/%_boot.c: $(BOOTROMS_DIR)/%_boot.bin
 	echo "/* AUTO-GENERATED */" > $@
 	echo "const unsigned char $(notdir $(@:%.c=%))[] = {" >> $@
 	hexdump -v -e '/1 "0x%02x, "' $< >> $@