Makefile - fix path from build/ to $(build)/

toolchain/glibc - armv7l - versioned name for linker
This commit is contained in:
Nathan Fisher 2021-03-06 08:04:58 -05:00
parent 1e85e6fb7e
commit 05bed5dde9
2 changed files with 3 additions and 3 deletions

View File

@ -82,8 +82,8 @@ $(build)/.built: $(tooldir)/.built $(build)/.skeleton.built
$(build)/.skeleton.built: | $(dirs) $(build)/.skeleton.built: | $(dirs)
install -d -m 0750 $(build)/root install -d -m 0750 $(build)/root
install -dv -m 1777 $(build)/tmp $(build)/var/tmp install -dv -m 1777 $(build)/tmp $(build)/var/tmp
[ -h build/var/run ] || ln -sv /run $(build)/var/run [ -h $(build)/var/run ] || ln -sv /run $(build)/var/run
[ -h build/var/lock ] || ln -sv /run/lock $(build)/var/lock [ -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/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" [ -c $(build)/dev/null ] || su -c "mknod -m 666 $(build)/dev/null c 1 3"
touch $@ touch $@

View File

@ -22,7 +22,7 @@ define makelinks
ln -sfv ../lib/ld-linux-x86-64.so.2 $(DESTDIR)/lib64/ld-lsb-x86-64.so.3 ln -sfv ../lib/ld-linux-x86-64.so.2 $(DESTDIR)/lib64/ld-lsb-x86-64.so.3
endef endef
else ifeq ($(arch),armv7l) 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) else ifeq ($(arch),riscv64)
makelinks = ln -sfv ../lib/ld-linux-riscv64-lp64d.so.1 $(DESTDIR)/lib64 makelinks = ln -sfv ../lib/ld-linux-riscv64-lp64d.so.1 $(DESTDIR)/lib64
endif endif