From 05bed5dde950c9289a62489cfb862c5b2a430adc Mon Sep 17 00:00:00 2001
From: Nathan Fisher <nfisher.sr@gmail.com>
Date: Sat, 6 Mar 2021 08:04:58 -0500
Subject: [PATCH] Makefile - fix path from build/ to $(build)/ toolchain/glibc
 - armv7l - versioned name for linker

---
 Makefile                 | 4 ++--
 toolchain/glibc/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f1f2c1e..741ba29 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,8 @@ $(build)/.built: $(tooldir)/.built $(build)/.skeleton.built
 $(build)/.skeleton.built: | $(dirs)
 	install -d -m 0750 $(build)/root
 	install -dv -m 1777 $(build)/tmp $(build)/var/tmp
-	[ -h build/var/run ] || ln -sv /run $(build)/var/run
-	[ -h build/var/lock ] || ln -sv /run/lock $(build)/var/lock
+	[ -h $(build)/var/run ] || ln -sv /run $(build)/var/run
+	[ -h $(build)/var/lock ] || ln -sv /run/lock $(build)/var/lock
 	[ -c $(build)/dev/console ] || su -c "mknod -m 600 $(build)/dev/console c 5 1"
 	[ -c $(build)/dev/null ] || su -c "mknod -m 666 $(build)/dev/null c 1 3"
 	touch $@
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 14bea55..9727f54 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -22,7 +22,7 @@ define makelinks
 	ln -sfv ../lib/ld-linux-x86-64.so.2 $(DESTDIR)/lib64/ld-lsb-x86-64.so.3
 endef
 else ifeq ($(arch),armv7l)
-makelinks     = ln -sfv ld-2.31.so $(DESTDIR)/lib/ld-linux.so.3
+makelinks     = ln -sfv ld-$(glibc_version).so $(DESTDIR)/lib/ld-linux.so.3
 else ifeq ($(arch),riscv64)
 makelinks     = ln -sfv ../lib/ld-linux-riscv64-lp64d.so.1 $(DESTDIR)/lib64
 endif