diff options
| author | Ian Moffett <ian@osmora.org> | 2025-05-31 17:17:13 -0400 |
|---|---|---|
| committer | Ian Moffett <ian@osmora.org> | 2025-05-31 17:17:13 -0400 |
| commit | 19497ac00ceb8e225ce7008df26024d4c6a1d2b9 (patch) | |
| tree | ecc9935cd04651ebd3bfcff92ac55ff81a619c45 | |
| parent | b86fde14a13edabcb6b9552910c89e64f68a6e8e (diff) | |
usr: Pass OS version and ARCH to user programs
Signed-off-by: Ian Moffett <ian@osmora.org>
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | builddeps/user.mk | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 1270a21..508ee1c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -73,12 +73,12 @@ all: stand/boot/ libc sbin bin base/boot/hyra-kernel .PHONY: sbin sbin: $(SBIN_MAKEDIRS) make -C usr.sbin/ LDSCRIPT=$(shell pwd)/usr.sbin/link.ld USRDIR=$(USRDIR)\ - ROOT=$(PROJECT_ROOT)\ + ROOT=$(PROJECT_ROOT) OSVER=$(HYRA_VERSION) OSARCH=$(ARCH) .PHONY: bin bin: $(BIN_MAKEDIRS) make -C usr.bin/ LDSCRIPT=$(shell pwd)/usr.bin/link.ld USRDIR=$(USRDIR)\ - ROOT=$(PROJECT_ROOT) + ROOT=$(PROJECT_ROOT) OSVER=$(HYRA_VERSION) OSARCH=$(ARCH) .PHONY: libc libc: diff --git a/builddeps/user.mk b/builddeps/user.mk index d7ad582..d991ef8 100644 --- a/builddeps/user.mk +++ b/builddeps/user.mk @@ -4,4 +4,5 @@ USRDIR = LDSCRIPT = INTERNAL_CFLAGS = -T$(LDSCRIPT) -znoexecstack -nostdlib -I$(USRDIR)/include/ \ -L$(USRDIR)/lib -lc -pie -no-pie -fno-stack-protector \ - -fno-asynchronous-unwind-tables + -fno-asynchronous-unwind-tables -D_OSVER=\"$(OSVER)\" \ + -D_OSARCH=\"$(OSARCH)\" |