From 4105029d0d6160404df8f56d150ba55488647057 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sat, 16 Mar 2019 20:01:34 -0600
Subject: [PATCH] Also create relibc toolchain tarball

---
 Makefile     | 18 +++++++++++-------
 mk/prefix.mk |  8 ++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9d994ee..ec290cf 100644
--- a/Makefile
+++ b/Makefile
@@ -70,11 +70,11 @@ ci-img: FORCE
 		build/livedisk-efi.iso.gz
 	rm -rf build/img
 	mkdir -p build/img
-	mv build/coreboot.elf.gz build/img/redox_$(IMG_TAG)_coreboot.elf.gz
-	mv build/harddrive.bin.gz build/img/redox_$(IMG_TAG)_harddrive.bin.gz
-	mv build/livedisk.iso.gz build/img/redox_$(IMG_TAG)_livedisk.iso.gz
-	mv build/harddrive-efi.bin.gz build/img/redox_$(IMG_TAG)_harddrive-efi.bin.gz
-	mv build/livedisk-efi.iso.gz build/img/redox_$(IMG_TAG)_livedisk-efi.iso.gz
+	cp "build/coreboot.elf.gz" "build/img/redox_$(IMG_TAG)_coreboot.elf.gz"
+	cp "build/harddrive.bin.gz" "build/img/redox_$(IMG_TAG)_harddrive.bin.gz"
+	cp "build/livedisk.iso.gz" "build/img/redox_$(IMG_TAG)_livedisk.iso.gz"
+	cp "build/harddrive-efi.bin.gz" "build/img/redox_$(IMG_TAG)_harddrive-efi.bin.gz"
+	cp "build/livedisk-efi.iso.gz" "build/img/redox_$(IMG_TAG)_livedisk-efi.iso.gz"
 	cd build/img && sha256sum -b * > SHA256SUM
 
 # CI packaging target
@@ -86,10 +86,14 @@ ci-pkg: prefix FORCE
 	./repo.sh "$${PACKAGES}"
 
 # CI toolchain
-ci-toolchain: prefix/$(TARGET)/gcc-install.tar.gz
+ci-toolchain: FORCE
+	$(MAKE) PREFIX_BINARY=0 \
+		"prefix/$(TARGET)/gcc-install.tar.gz" \
+		"prefix/$(TARGET)/relibc-install.tar.gz"
 	rm -rf build/toolchain
 	mkdir -p "build/toolchain/$(TARGET)"
-	mv "$<" "build/toolchain/$(TARGET)"
+	cp "prefix/$(TARGET)/gcc-install.tar.gz" "build/toolchain/$(TARGET)/gcc-install.tar.gz"
+	cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(TARGET)/relibc-install.tar.gz"
 	cd "build/toolchain/$(TARGET)" && sha256sum -b * > SHA256SUM
 
 env: prefix FORCE
diff --git a/mk/prefix.mk b/mk/prefix.mk
index 984974c..6fb0b8d 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -26,6 +26,14 @@ $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX)/gcc-install
 	touch "$@.partial"
 	mv "$@.partial" "$@"
 
+$(PREFIX)/relibc-install.tar.gz: $(PREFIX)/relibc-install
+	tar \
+		--create \
+		--gzip \
+		--file "$@" \
+		--directory="$<" \
+		.
+
 ifeq ($(PREFIX_BINARY),1)
 
 $(PREFIX)/gcc-install.tar.gz: