From 471886467ee05046e8bd9e3621878e06ca9cbd5f Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Sun, 19 Apr 2020 10:38:49 -0700 Subject: feat: added skeleton libc and updated generated makefiles to correctly set target specific flags --- Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1a21e76..344b88b 100644 --- a/Makefile +++ b/Makefile @@ -15,15 +15,11 @@ INCS := -I$(INC_DIR) CFLAGS := -g -fno-strict-aliasing -fwrapv -fms-extensions AFLAGS := -f elf64 -TGTFLAG := -TGTINCS := -TGTLIBS := - # Named generic rules (must be evaluated lazily) -COMPILE = $(CC) -MMD $(CFLAGS) $(TGTFLAGS) $(INCS) $(TGTINCS) -o $@ -c $< -LINK = $(CC) -MMD $(CFLAGS) $(TGTFLAGS) -o $@ $^ $(LIBS) $(TGTLIBS) -COMPLINK = $(CC) -MMD $(CFLAGS) $(TGTFLAGS) $(INCS) $(TGTINCS) -o $@ $^ $(LIBS) -ASSEMBLE = $(AS) $(AFLAGS) $(TGTFLAGS) -o $@ $< +COMPILE = $(CC) -MMD $(CFLAGS) $(TCFLAGS) $(INCS) $(TCINCS) -o $@ -c $< +LINK = $(CC) -MMD $(CFLAGS) $(TCFLAGS) -o $@ $^ $(LIBS) $(TCLIBS) +COMPLINK = $(CC) -MMD $(CFLAGS) $(TCFLAGS) $(INCS) $(TCINCS) -o $@ $^ $(LIBS) $(TCLIBS) +ASSEMBLE = $(AS) $(AFLAGS) $(TCFLAGS) -o $@ $< ARCHIVE = $(AR) crs $@ $^ include rules.mk -- cgit v1.2.1