From 02574c26bdad6aaf2701e740eeed3acb8270ee80 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 16 Jun 2019 19:37:40 -0600
Subject: [PATCH] Merge prefix changes from master

---
 mk/prefix.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index 17f8325..aeecbbf 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -80,6 +80,7 @@ $(PREFIX)/rust-install.tar.gz: $(PREFIX)/rust-install
 		--file "$@" \
 		--directory="$<" \
 		.
+
 ifeq ($(PREFIX_BINARY),1)
 
 $(PREFIX)/gcc-install.tar.gz:
@@ -91,6 +92,8 @@ $(PREFIX)/gcc-install: $(PREFIX)/gcc-install.tar.gz
 	rm -rf "$@.partial" "$@"
 	mkdir -p "$@.partial"
 	tar --extract --file "$<" --directory "$@.partial" --strip-components=1
+	[ -n "$$NIX_INTERPRETER" ] && find "$@.partial" -executable -type f -exec \
+		patchelf --set-interpreter "$$NIX_INTERPRETER" "{}" \;
 	touch "$@.partial"
 	mv "$@.partial" "$@"