From: Keith Packard <keithp@keithp.com>
Date: Sun, 21 Feb 2010 22:30:00 +0000 (-0800)
Subject: bin/mklib: Clear CDPATH to avoid damaging expand_archive output
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=edd85bcd6bc92beaf266a602da76d2aefe836a8e;p=mesa.git

bin/mklib: Clear CDPATH to avoid damaging expand_archive output

The bash 'cd' command tends to emit random stuff to stdout when the
CDPATH variable is set, so clear it to keep extra filenames from being
emitted from the expand_archive function, which would otherwise cause
mklib to fail.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
---

diff --git a/bin/mklib b/bin/mklib
index 06e8029cb6d..7f2272584e5 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -25,6 +25,10 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+# Clear CDPATH as the 'cd' command will echo stuff
+# to stdout if it is set
+unset CDPATH
+
 # Given a list of files, look for .a archives and unpack them.
 # Return the original list of files minus the .a files plus the unpacked files.
 # first param:  name of a temp directory (to be deleted when finished)