encounter
/
dtk-template
mirror of https://github.com/encounter/dtk-template.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move conditional linker flag additions from project.py to configure.py (#35)

This commit is contained in:
Nathan 2024-09-07 02:18:53 -06:00 committed by GitHub
parent 2049aeb371
commit 3f0a1529ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.py
View File

@ -178,10 +178,17 @@ cflags_base = [
f"-DVERSION={version_num}", 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: if config.debug:
# Debug flags
cflags_base.extend(["-sym on", "-DDEBUG=1"]) cflags_base.extend(["-sym on", "-DDEBUG=1"])
config.ldflags.append("-g")
else: else:
# No-debug flags
cflags_base.append("-DNDEBUG=1") cflags_base.append("-DNDEBUG=1")
# Metrowerks library flags # Metrowerks library flags

8
tools/project.py
View File

@ -131,7 +131,6 @@ class ProjectConfig:
self.build_rels: bool = True # Build REL files self.build_rels: bool = True # Build REL files
self.check_sha_path: Optional[Path] = None # Path to version.sha1 self.check_sha_path: Optional[Path] = None # Path to version.sha1
self.config_path: Optional[Path] = None # Path to config.yml 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.generate_map: bool = False # Generate map file(s)
self.asflags: Optional[List[str]] = None # Assembler flags self.asflags: Optional[List[str]] = None # Assembler flags
self.ldflags: Optional[List[str]] = None # Linker flags self.ldflags: Optional[List[str]] = None # Linker flags
@ -283,12 +282,7 @@ def generate_build_ninja(
# Variables # Variables
### ###
n.comment("Variables") n.comment("Variables")
ldflags = " ".join(config.ldflags or []) n.variable("ldflags", " ".join(config.ldflags or []))
if config.generate_map:
ldflags += " -mapunused"
if config.debug:
ldflags += " -g"
n.variable("ldflags", ldflags)
if config.linker_version is None: if config.linker_version is None:
sys.exit("ProjectConfig.linker_version missing") sys.exit("ProjectConfig.linker_version missing")
n.variable("mw_version", Path(config.linker_version)) n.variable("mw_version", Path(config.linker_version))