From 0de0ce58939932aee786679a86d08b5227732fab Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 15:59:57 +0000
Subject: substitute(): --subst-var was silently coercing to "" if the variable
 does not exist.

---
 pkgs/stdenv/generic/setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pkgs/stdenv/generic/setup.sh')

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 87465df1482a..19dbdf8848e0 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -661,6 +661,10 @@ substituteStream() {
                     echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2
                     return 1
                 fi
+                if [ -z ${!varName+x} ]; then
+                    echo "substituteStream(): ERROR: variable \$$varName is unset" >&2
+                    return 1
+                fi
                 pattern="@$varName@"
                 replacement="${!varName}"
                 ;;
-- 
cgit 1.4.1