From 1e85e6fb7e3885b4aeb1dd54875e63c311e90f66 Mon Sep 17 00:00:00 2001 From: Nathan Fisher Date: Thu, 4 Mar 2021 14:33:49 -0500 Subject: [PATCH] toolchain/pax - ensure $(bindir) is present before install $(basedir)/Makefile - fix paths for toolchain archive creation --- Makefile | 7 ++++--- toolchain/pax/Makefile | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ebcaf7b..f1f2c1e 100644 --- a/Makefile +++ b/Makefile @@ -76,6 +76,7 @@ $(build)/.stripped: $(build)/.built: $(tooldir)/.built $(build)/.skeleton.built $(MAKE) -C world + find $(build)/lib $(build)/usr/lib $(build)/usr/lib64 -name '*.la' -delete touch $@ $(build)/.skeleton.built: | $(dirs) @@ -113,13 +114,13 @@ rootfs-txz: rootfs-hhl-$(os_version)-$(arch).txz .PHONY: rootfs-tgz rootfs-tbz rootfs-txz toolchain-hhl-$(os_version)-$(arch).tgz: $(tooldir)/.built smalltools - cd $(tooldir) && paxtar -M uidgid -czf $(basedir)/$@ toolchain-$(arch) + cd build && paxtar -M uidgid -czf $(basedir)/$@ toolchain-$(arch) toolchain-hhl-$(os_version)-$(arch).tbz: $(tooldir)/.built smalltools - cd $(tooldir) && paxtar -M uidgid -cjf $(basedir)/$@ toolchain-$(arch) + cd build && paxtar -M uidgid -cjf $(basedir)/$@ toolchain-$(arch) toolchain-hhl-$(os_version)-$(arch).txz: $(tooldir)/.built smalltools - cd $(tooldir) && paxtar -M uidgid -cJf $(basedir)/$@ toolchain-$(arch) + cd build && paxtar -M uidgid -cJf $(basedir)/$@ toolchain-$(arch) rootfs-hhl-$(os_version)-$(arch).tgz: $(plists) $(build)/.stripped cd $(build) && paxtar -M uidgid -czf $(basedir)/$@ $(alldirs) diff --git a/toolchain/pax/Makefile b/toolchain/pax/Makefile index b4e7c47..b914234 100644 --- a/toolchain/pax/Makefile +++ b/toolchain/pax/Makefile @@ -27,6 +27,9 @@ $(bindir)/$(progname): $(objs) | $(bindir) $(objdir)/%.o: $(src)/%.c $(hdrs) | $(objdir) $(CC) $(cflags) -o $@ -c $< +$(bindir): + install -d $@ + $(objdir): $(info $(grn)=== Building for $(progname) ===$(reset)) install -d $@