From 3f0a1529ffe6881f9e27545edc684083dd845498 Mon Sep 17 00:00:00 2001
From: Nathan <nathanhurst03@gmail.com>
Date: Sat, 7 Sep 2024 02:18:53 -0600
Subject: [PATCH] Move conditional linker flag additions from project.py to
 configure.py (#35)

---
 configure.py     | 9 ++++++++-
 tools/project.py | 8 +-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure.py b/configure.py
index 58fd50a..8d42031 100755
--- a/configure.py
+++ b/configure.py
@@ -178,10 +178,17 @@ cflags_base = [
     f"-DVERSION={version_num}",
 ]
 
-# Debug flags
+# Conditionally-added flags
+if config.generate_map:
+    # List unused symbols when generating a map file
+    config.ldflags.append("-mapunused")
+
 if config.debug:
+    # Debug flags
     cflags_base.extend(["-sym on", "-DDEBUG=1"])
+    config.ldflags.append("-g")
 else:
+    # No-debug flags
     cflags_base.append("-DNDEBUG=1")
 
 # Metrowerks library flags
diff --git a/tools/project.py b/tools/project.py
index 9cfc2d5..2e7ad6b 100644
--- a/tools/project.py
+++ b/tools/project.py
@@ -131,7 +131,6 @@ class ProjectConfig:
         self.build_rels: bool = True  # Build REL files
         self.check_sha_path: Optional[Path] = None  # Path to version.sha1
         self.config_path: Optional[Path] = None  # Path to config.yml
-        self.debug: bool = False  # Build with debug info
         self.generate_map: bool = False  # Generate map file(s)
         self.asflags: Optional[List[str]] = None  # Assembler flags
         self.ldflags: Optional[List[str]] = None  # Linker flags
@@ -283,12 +282,7 @@ def generate_build_ninja(
     # Variables
     ###
     n.comment("Variables")
-    ldflags = " ".join(config.ldflags or [])
-    if config.generate_map:
-        ldflags += " -mapunused"
-    if config.debug:
-        ldflags += " -g"
-    n.variable("ldflags", ldflags)
+    n.variable("ldflags", " ".join(config.ldflags or []))
     if config.linker_version is None:
         sys.exit("ProjectConfig.linker_version missing")
     n.variable("mw_version", Path(config.linker_version))