From 636a90f6d55da151b74082d38ebb172530c870ae Mon Sep 17 00:00:00 2001
From: Mitchell Lehman <lehmml04@pfw.edu>
Date: Tue, 3 Nov 2020 13:21:22 -0500
Subject: [PATCH] Added rule to skip forcinga compiler when building for libnx

---
 libretro-build-common.sh | 55 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 6fea7f8b..165ad3e0 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -236,6 +236,55 @@ build_makefile() {
 	fi
 }
 
+# build_makefile_libnx: Remove compiler setting from regular makefile
+build_makefile_libnx() {
+	[ -n "$core_build_subdir" ] && core_build_subdir="/$core_build_subdir"
+
+	make_cmdline="$MAKE"
+	if [ -n "$core_build_makefile" ]; then
+		make_cmdline="$make_cmdline -f $core_build_makefile"
+	fi
+
+	# TODO: Do $platform type stuff better (requires modding each core)
+	make_cmdline="$make_cmdline platform=\"$core_build_platform\""
+
+	[ -n "$STATIC_LINKING" ] && make_cmdline="$make_cmdline STATIC_LINKING=1"
+
+	[ -n "$JOBS" ] && make_cmdline="$make_cmdline -j$JOBS"
+	[ -n "$DEBUG" ] && make_cmdline="$make_cmdline DEBUG=$DEBUG"
+
+	build_dir="$WORKDIR/$core_dir$core_build_subdir"
+
+	if build_should_skip $1 "$build_dir"; then
+		echo "Core $1 is already built, skipping..."
+		return
+	fi
+
+
+	if [ -d "$build_dir" ]; then
+		echo_cmd "cd \"$build_dir\""
+
+		$core_build_configure
+
+		if [ -z "$NOCLEAN" ]; then
+			$core_build_preclean
+			echo_cmd "$make_cmdline $core_build_args clean"
+		fi
+		#make_cmdline="$make_cmdline $COMPILER" removed to work with libnx compilation
+
+		$core_build_prebuild
+		echo_cmd "$make_cmdline $core_build_args"
+
+		# TODO: Make this a separate stage/package rule
+		$core_build_prepkg
+		for a in $core_build_cores; do
+			copy_core_to_dist ${core_build_products:+$core_build_products/}$a $a
+		done
+	else
+		echo "$1 not fetched, skipping ..."
+	fi
+}
+
 
 # libretro_build_core: Build the given core using its build rules
 #
@@ -307,7 +356,11 @@ libretro_build_core() {
 
 			eval "core_build_cores=\${libretro_${1}_build_cores:-$1}"
 			eval "core_build_products=\$libretro_${1}_build_products"
-			build_makefile $1 2>&1
+			if [ "$platform" = "libnx" ]; then
+				build_makefile_libnx $1 2>&1
+			else
+				build_makefile $1 2>&1
+			fi
 			;;
 
 		legacy)