summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Moffett <ian@osmora.org>2024-03-14 21:37:02 -0400
committerIan Moffett <ian@osmora.org>2024-03-14 21:43:18 -0400
commit1452885f6fdb0938b894110e3d7e00200e82afcc (patch)
treec2599b97ec3747f38aa238e559fca997eebd8249
parentd0f81e3d2afdf7a89fd466799f2d900da9f2ac40 (diff)
build: Cleanup Makefile.in user flags
Signed-off-by: Ian Moffett <ian@osmora.org>
-rw-r--r--Makefile.in4
1 files changed, 3 insertions, 1 deletions
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