Merge prefix changes from master

This commit is contained in:
Jeremy Soller 2019-06-16 19:37:40 -06:00
parent edc7446f2c
commit 02574c26bd
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1

View file

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