From c6c7769d9dd166c45bd9d422e91ca537752c0382 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 8 Mar 2021 01:41:35 -0500 Subject: sim: introduce {COMPILE,LINK}_FOR_BUILD These use the same pattern as seen in the opcodes/ dir and in automake in general (ish). This helps simplify the boilerplate for building and linking build-time code, and fixes some inconsistency in flag usage. For rules that were compiling+linking in a single step, split them into separate steps so we can apply the correct set of options. This matches automake behavior too. --- sim/m32c/ChangeLog | 5 +++++ sim/m32c/Makefile.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'sim/m32c') diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index d9997c7..85fd5c2 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,8 @@ +2021-03-13 Mike Frysinger + + * Makefile.in (opc2c.o, safe-fgets.o): Call COMPILE_FOR_BUILD. + (opc2c): Call LINK_FOR_BUILD. + 2021-03-08 Mike Frysinger * Makefile.in (opc2c): Delete $(BUILD_LIBS). diff --git a/sim/m32c/Makefile.in b/sim/m32c/Makefile.in index 91f52a7..6bc5c5b 100644 --- a/sim/m32c/Makefile.in +++ b/sim/m32c/Makefile.in @@ -53,13 +53,13 @@ m32c.c : m32c.opc opc2c ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c opc2c : opc2c.o safe-fgets.o - $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@ + $(LINK_FOR_BUILD) $^ encodings: grep '/\* [01]' $(srcdir)/r8c.opc | sort opc2c.o : opc2c.c safe-fgets.h - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/opc2c.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/opc2c.c safe-fgets.o : safe-fgets.c safe-fgets.h - $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/safe-fgets.c + $(COMPILE_FOR_BUILD) -c $(srcdir)/safe-fgets.c -- cgit v1.1