# HG changeset patch # User Paul Boddie # Date 1655046630 -7200 # Node ID ba6c9728a9aec561953579c3f35bdde607fbcb1b # Parent 927ad10340fb9e60868b2094095c1731d5d02b9c Attempted to fix host program compilation. diff -r 927ad10340fb -r ba6c9728a9ae libe2access/host/Makefile --- a/libe2access/host/Makefile Sun May 22 22:51:40 2022 +0200 +++ b/libe2access/host/Makefile Sun Jun 12 17:10:30 2022 +0200 @@ -22,7 +22,12 @@ OBJECTS = objects # Tool definitions. +# Somehow, things like AR, CC and LD are removed when this Makefile is invoked +# by the L4Re build system. +AR = ar +CC = cc +LD = ld RANLIB = ranlib # Compilation and linking flags. @@ -62,6 +67,8 @@ .PHONY: all clean distclean +.SUFFIXES: .c .o + all: $(TARGETS) clean: diff -r 927ad10340fb -r ba6c9728a9ae test_files/Makefile --- a/test_files/Makefile Sun May 22 22:51:40 2022 +0200 +++ b/test_files/Makefile Sun Jun 12 17:10:30 2022 +0200 @@ -14,9 +14,9 @@ all:: $(TARGET) $(PROGRAMS_DIR) $(TARGET): $(PROGRAMS_DIR) - make -C $(E2ACCESS_DIR) + $(MAKE) -C $(E2ACCESS_DIR) && \ $(PKGDIR)/mk_e2test.sh -q $(PKGDIR) $(PROGRAMS_DIR) $(E2ACCESS_DIR) $@ $(PROGRAMS_DIR): $(PKGDIR)/programs/*.c* - make -C $(PKGDIR)/programs $(MKFLAGS) + $(MAKE) -C $(PKGDIR)/programs $(MKFLAGS) && \ touch $@