diff options
| author | Ian Moffett <ian@osmora.org> | 2025-05-02 12:26:53 -0400 |
|---|---|---|
| committer | Ian Moffett <ian@osmora.org> | 2025-05-02 12:26:53 -0400 |
| commit | c538324f4cce3183a2e068d18ddc047e0e7043a5 (patch) | |
| tree | 22b65dc80f552acfb3db3c54c51ce2e16f6ca430 | |
| parent | 80282ceadbb47005d5b654fb06247bee6930d051 (diff) | |
build: Pass project root to other build dirs
Signed-off-by: Ian Moffett <ian@osmora.org>
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 2effa66..9014e2d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -73,20 +73,19 @@ all: base libc sbin bin base/boot/hyra-kernel ramfs iso .PHONY: sbin sbin: $(SBIN_MAKEDIRS) $(MAKE) -C $^ -I$(shell pwd)/builddeps \ - LDSCRIPT=$(shell pwd)/usr.sbin/link.ld USRDIR=$(USRDIR) - find $^ -type f -executable -exec mv {} base/usr/sbin/ \; + LDSCRIPT=$(shell pwd)/usr.sbin/link.ld USRDIR=$(USRDIR)\ + ROOT=$(PROJECT_ROOT) .PHONY: bin bin: $(BIN_MAKEDIRS) $(MAKE) -C $^ -I$(shell pwd)/builddeps \ - LDSCRIPT=$(shell pwd)/usr.bin/link.ld USRDIR=$(USRDIR) - find $^ -type f -executable -exec mv {} base/usr/bin/ \; + LDSCRIPT=$(shell pwd)/usr.bin/link.ld USRDIR=$(USRDIR) \ + ROOT=$(PROJECT_ROOT) .PHONY: libc libc: $(MAKE) -C lib/libc/ -I$(shell pwd)/builddeps \ - USRDIR=$(USRDIR) ARCH=$(ARCH) - cp lib/libc/build/libc.a base/usr/lib/ + USRDIR=$(USRDIR) ARCH=$(ARCH) ROOT=$(PROJECT_ROOT) .PHONY: base base: |