From 1452885f6fdb0938b894110e3d7e00200e82afcc Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Thu, 14 Mar 2024 21:37:02 -0400 Subject: build: Cleanup Makefile.in user flags Signed-off-by: Ian Moffett --- Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 26ee59a..a6a8a9d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,6 +47,8 @@ else override LD = $(shell pwd)/cross/bin/$(ARCH)-hyra-ld endif override AS = $(CC) +LDSO = $(shell pwd)/base/usr/lib/ld.so +override USER_MKFLGS = CC=$(CC) LD=$(LD) LDSO=$(LDSO) ########################## # Architecture specifics @@ -74,7 +76,7 @@ all: base lib userland base/usr/lib/ld.so base/boot/hyra-kernel rm -rf iso_root base/usr/sbin/init: - cd usr.sbin/; make CC=$(CC) LD=$(LD) + cd usr.sbin/; make $(USER_MKFLGS) mv usr.sbin/init/init base/usr/sbin/ # TODO: Make this more flexible -- cgit v1.2.3