encounter/dtk-template
1
0
Fork 0
mirror of https://github.com/encounter/dtk-template.git synced 2025-09-22 02:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only use asm from asm_dir if source is non-matching

Browse Source 
Resolves #49
This commit is contained in:
Luke Street 2025-06-01 15:40:24 -06:00
parent f6f10ea187
commit c3ddfc779c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/project.py
View File

@ -621,8 +621,7 @@ def generate_build_ninja(
# GNU as # GNU as
gnu_as = binutils / f"powerpc-eabi-as{EXE}" gnu_as = binutils / f"powerpc-eabi-as{EXE}"
gnu_as_cmd = ( gnu_as_cmd = (
f"{CHAIN}{gnu_as} $asflags -o $out $in" f"{CHAIN}{gnu_as} $asflags -o $out $in" + f" && {dtk} elf fixup $out $out"
+ f" && {dtk} elf fixup $out $out"
) )
gnu_as_implicit = [binutils_implicit or gnu_as, dtk] gnu_as_implicit = [binutils_implicit or gnu_as, dtk]
# As a workaround for https://github.com/encounter/dtk-template/issues/51 # As a workaround for https://github.com/encounter/dtk-template/issues/51
@ -964,7 +963,11 @@ def generate_build_ninja(
link_built_obj = False link_built_obj = False
# Assembly overrides # Assembly overrides
if obj.asm_path is not None and obj.asm_path.exists(): if (
not link_built_obj
and obj.asm_path is not None
and obj.asm_path.exists()
):
link_built_obj = True link_built_obj = True
built_obj_path = asm_build(obj, obj.asm_path, obj.asm_obj_path) built_obj_path = asm_build(obj, obj.asm_path, obj.asm_obj_path)