hare

[hare] The Hare programming language
git clone https://git.torresjrjr.com/hare.git
Log | Files | Refs | README | LICENSE

commit 876a858f8fde964dfa44490af9df8b4eb7f6559e
parent 53a69bdd12e966d97d84f2d66812ec4452f8e191
Author: Sebastian <sebastian@sebsite.pw>
Date:   Mon,  8 May 2023 20:47:21 -0400

gen-stdlib: print correct $(AR) utility

Finishes commit 798e7b63d399ae347bf85bd512581cfc563bfc5e, which didn't
fix gen-stdlib, and also missed the errors when builting tests.

Signed-off-by: Sebastian <sebastian@sebsite.pw>

Diffstat:
Mscripts/gen-stdlib | 4++--
Mstdlib.mk | 4++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/gen-stdlib b/scripts/gen-stdlib @@ -141,11 +141,11 @@ ${stdlib}_asm = \$($cache)/rt/syscall.o \\ @\$(AS) -o \$@ \$(STDLIB)/rt/+\$(ARCH)/cpuid_native.s \$($cache)/rt/rt-linux.a: \$($cache)/rt/rt-linux.o \$(${stdlib}_asm) - @printf 'AS \t%s\n' "\$@" + @printf 'AR \t%s\n' "\$@" @\$(AR) -csr \$@ \$($cache)/rt/rt-linux.o \$(${stdlib}_asm) \$($cache)/rt/rt-freebsd.a: \$($cache)/rt/rt-freebsd.o \$(${stdlib}_asm) - @printf 'AS \t%s\n' "\$@" + @printf 'AR \t%s\n' "\$@" @\$(AR) -csr \$@ \$($cache)/rt/rt-freebsd.o \$(${stdlib}_asm) ${stdlib}_rt = \$($cache)/rt/rt-\$(PLATFORM).a diff --git a/stdlib.mk b/stdlib.mk @@ -2342,11 +2342,11 @@ $(TESTCACHE)/rt/cpuid_native.o: $(STDLIB)/rt/+$(ARCH)/cpuid_native.s @$(AS) -o $@ $(STDLIB)/rt/+$(ARCH)/cpuid_native.s $(TESTCACHE)/rt/rt-linux.a: $(TESTCACHE)/rt/rt-linux.o $(testlib_asm) - @printf 'AS \t%s\n' "$@" + @printf 'AR \t%s\n' "$@" @$(AR) -csr $@ $(TESTCACHE)/rt/rt-linux.o $(testlib_asm) $(TESTCACHE)/rt/rt-freebsd.a: $(TESTCACHE)/rt/rt-freebsd.o $(testlib_asm) - @printf 'AS \t%s\n' "$@" + @printf 'AR \t%s\n' "$@" @$(AR) -csr $@ $(TESTCACHE)/rt/rt-freebsd.o $(testlib_asm) testlib_rt = $(TESTCACHE)/rt/rt-$(PLATFORM).a