From 048b166d0c7630d2b40f12ecfc69c880697a0248 Mon Sep 17 00:00:00 2001
From: alex <16batesa@gmail.com>
Date: Wed, 18 Aug 2021 18:10:11 +0100
Subject: [PATCH] configure: use relative paths & fix arm toolchain

---
 tools/{ => build}/arm/cc1                   | Bin
 tools/{ => build}/arm/mips-nintendo-nu64-as | Bin
 tools/build/configure.py                    |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename tools/{ => build}/arm/cc1 (100%)
 rename tools/{ => build}/arm/mips-nintendo-nu64-as (100%)

diff --git a/tools/arm/cc1 b/tools/build/arm/cc1
similarity index 100%
rename from tools/arm/cc1
rename to tools/build/arm/cc1
diff --git a/tools/arm/mips-nintendo-nu64-as b/tools/build/arm/mips-nintendo-nu64-as
similarity index 100%
rename from tools/arm/mips-nintendo-nu64-as
rename to tools/build/arm/mips-nintendo-nu64-as
diff --git a/tools/build/configure.py b/tools/build/configure.py
index 9067f850f2..f389688ef9 100755
--- a/tools/build/configure.py
+++ b/tools/build/configure.py
@@ -18,7 +18,7 @@ ASFLAGS = "-EB -G 0"
 
 # Paths:
 ROOT = Path(__file__).parent.parent.parent
-BUILD_TOOLS = ROOT / "tools" / "build" # directory where this file is (TODO: use relative_to)
+BUILD_TOOLS = (ROOT / "tools" / "build").relative_to(ROOT)
 YAY0_COMPRESS_TOOL = f"{BUILD_TOOLS}/yay0/Yay0compress"
 CRC_TOOL = f"{BUILD_TOOLS}/rom/n64crc"
 
@@ -639,7 +639,7 @@ if __name__ == "__main__":
         for version in VERSIONS:
             rom = ROOT / f"ver/{version}/baserom.z64"
 
-            print(f"configure: looking for baserom {rom}", end="")
+            print(f"configure: looking for baserom {rom.relative_to(ROOT)}", end="")
 
             if rom.exists():
                 print("...found")