From f6f10ea187e4fc50f3d882e3bb6b82919dc29c9d Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 1 Jun 2025 15:30:06 -0600 Subject: [PATCH] Remove depfile from GNU as commands Instead, hardcodes an implicit dependency on build/GAMEID/include/macros.inc, which is always written by decomp-toolkit. Resolves #51 --- tools/project.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/project.py b/tools/project.py index a340e49..1c2cd15 100644 --- a/tools/project.py +++ b/tools/project.py @@ -621,10 +621,13 @@ def generate_build_ninja( # GNU as gnu_as = binutils / f"powerpc-eabi-as{EXE}" gnu_as_cmd = ( - f"{CHAIN}{gnu_as} $asflags -o $out $in -MD $out.d" + f"{CHAIN}{gnu_as} $asflags -o $out $in" + f" && {dtk} elf fixup $out $out" ) gnu_as_implicit = [binutils_implicit or gnu_as, dtk] + # As a workaround for https://github.com/encounter/dtk-template/issues/51 + # include macros.inc directly as an implicit dependency + gnu_as_implicit.append(build_path / "include" / "macros.inc") if os.name != "nt": transform_dep = config.tools_dir / "transform_dep.py" @@ -676,8 +679,9 @@ def generate_build_ninja( name="as", command=gnu_as_cmd, description="AS $out", - depfile="$out.d", - deps="gcc", + # See https://github.com/encounter/dtk-template/issues/51 + # depfile="$out.d", + # deps="gcc", ) n.newline()