From 2d16f03ca44269d79a28f04884165bbbb6286ba5 Mon Sep 17 00:00:00 2001 From: aqua Date: Tue, 21 Feb 2023 17:54:34 +0200 Subject: Rename host and target tool names - target tool prefix is ${ARCH}_ - host tool prefix is HOST_ --- rules.mk | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'rules.mk') diff --git a/rules.mk b/rules.mk index 893cea8..a802d0d 100644 --- a/rules.mk +++ b/rules.mk @@ -46,54 +46,54 @@ debug: targets: ${TARGETS} # extra flags -CFLAGS += -I../lib/libk \ - -Werror=implicit-function-declaration -CXXFLAGS += -I../lib/libk -Drestrict=__restrict__ +${ARCH}_CFLAGS += -I../lib/libk \ + -Werror=implicit-function-declaration +${ARCH}_CXXFLAGS += -I../lib/libk -Drestrict=__restrict__ # Depndency rules %.d: %.S - @${CC} ${CFLAGS} -M -MT $(<:.S=_${ARCH}.o) $< -MF $@ + @${${ARCH}_CC} ${${ARCH}_CFLAGS} -M -MT $(<:.S=_${ARCH}.o) $< -MF $@ %.d: %.c - @${CC} ${CFLAGS} -M -MT $(<:.c=_${ARCH}.o) $< -MF $@ + @${${ARCH}_CC} ${${ARCH}_CFLAGS} -M -MT $(<:.c=_${ARCH}.o) $< -MF $@ %.d: %.cpp - @${CXX} ${CXXFLAGS} -M -MT $(<:.cpp=_${ARCH}.o) $< -MF $@ + @${${ARCH}_CXX} ${${ARCH}_CXXFLAGS} -M -MT $(<:.cpp=_${ARCH}.o) $< -MF $@ %.d: %.cc - @${TEST_CXX} ${TEST_CXXFLAGS} -M -MT $(<:.cc=_${ARCH}.o) $< -MF $@ + @${HOST_CXX} ${HOST_CXXFLAGS} -M -MT $(<:.cc=_${ARCH}.o) $< -MF $@ # Suffix rules %.a: @echo ' AR $@' - @${AR} ${ARFLAGS} $@ $(filter %.o,$^) + @${${ARCH}_AR} ${${ARCH}_ARFLAGS} $@ $(filter %.o,$^) %_${ARCH}.o: %.s @echo ' AS $<' - @$(AS) $(ASFLAGS) -c -o $@ $< + @${${ARCH}_AS} ${${ARCH}_ASFLAGS} -c -o $@ $< %_${ARCH}.o: %.S @echo ' CC $<' - @$(CC) $(CFLAGS) -c -o $@ $< + @${${ARCH}_CC} ${${ARCH}_CFLAGS} -c -o $@ $< %_${ARCH}.o: %.c @echo ' CC $<' - @$(CC) $(CFLAGS) -c -o $@ $< + @${${ARCH}_CC} ${${ARCH}_CFLAGS} -c -o $@ $< %_${ARCH}.o: %.cpp @echo ' CXX $<' - @$(CXX) $(CXXFLAGS) -c -o $@ $< + @${${ARCH}_CXX} ${${ARCH}_CXXFLAGS} -c -o $@ $< %.elf: @echo ' LD $@' - @${LD} ${LDFLAGS} -o $@ $^ + @${${ARCH}_LD} ${${ARCH}_LDFLAGS} -o $@ $^ @echo -n ' B2b ' @b2sum $@ | cut -d' ' -f1 # test rules tst/%: tst/%.cc @echo ' CXX TEST $@' - @$(TEST_CXX) $(TEST_CXXFLAGS) $< -o $@ + @${HOST_CXX} ${HOST_CXXFLAGS} $< -o $@ .PHONY: test.base valgrind.base clean.base FORCE test.base: ${TESTS} -- cgit v1.2.1