diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index ac6efc49..6fea7f8b 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -221,11 +221,6 @@ build_makefile() {
 			$core_build_preclean
 			echo_cmd "$make_cmdline $core_build_args clean"
 		fi
-		
-		if [ "$platform" = "libnx" ]; then
-			COMPILER="CC=aarch64-none-elf-gcc"
-		fi
-		
 		make_cmdline="$make_cmdline $COMPILER"
 
 		$core_build_prebuild
diff --git a/libretro-config.sh b/libretro-config.sh
index dc7fe5ea..336efd18 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -647,6 +647,10 @@ case "$platform" in
 		FORMAT_COMPILER_TARGET=libnx
 		FORMAT_COMPILER_TARGET_ALT=libnx
 		FORMAT=_libnx
+		
+		CC="$DEVKITPRO/devkitA64/bin/aarch64-none-elf-gcc$BINARY_EXT"
+		CXX="$DEVKITPRO/devkitA64/bin/aarch64-none-elf-g++$BINARY_EXT"
+		AR="$DEVKITPRO/devkitA64/bin/aarch64-none-elf-ar$BINARY_EXT"
 
 		;;