From 72380b0190380959961797a742b07f23f5af2f80 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 14 Aug 2020 20:47:30 -0500
Subject: [PATCH] [nostalgia] Make current build always use current platform

---
 Makefile            | 4 ++--
 scripts/setup-build | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2808a253..aad16e6f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ OS=$(shell uname | tr [:upper:] [:lower:])
 HOST_ENV=${OS}-$(shell uname -m)
 DEVENV=devenv$(shell pwd | sed 's/\//-/g')
 DEVENV_IMAGE=nostalgia-devenv
-VCPKG_DIR=./.vcpkg-${HOST_ENV}/
-CURRENT_BUILD=$(file < .current_build)
+VCPKG_DIR=./.vcpkg-$(HOST_ENV)/
+CURRENT_BUILD=$(HOST_ENV)-$(file < .current_build)
 ifneq ($(shell which docker 2> /dev/null),)
 	ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
 		ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
diff --git a/scripts/setup-build b/scripts/setup-build
index de6a8787..0090252c 100755
--- a/scripts/setup-build
+++ b/scripts/setup-build
@@ -47,7 +47,7 @@ cmake -S $project -B $buildDir -GNinja \
 
 mkdir -p dist
 if [[ $target != gba ]] && [[ $target != gba-debug ]]; then
-	echo ${buildConfig} > .current_build
+	echo ${buildType} > .current_build
 fi
 rm -f compile_commands.json
 ln -s build/${buildConfig}/compile_commands.json