From 6aa86e5cd10db5c2dffff4d0d378dbe4cee77e46 Mon Sep 17 00:00:00 2001
From: Guillaume Bonnet <guillaumebonnet10@gmail.com>
Date: Thu, 21 Jan 2016 13:08:17 +0100
Subject: [PATCH] configure: Do not generate two stage0 rustlib dirs when
 --libdir is set

---
 configure | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 446a6e3feae..7df98d1bd56 100755
--- a/configure
+++ b/configure
@@ -1361,16 +1361,22 @@ for h in $CFG_HOST
 do
     for t in $CFG_TARGET
     do
+        # host bin dir stage0
+        make_dir $h/stage0/bin
+
         # host lib dir stage0
         make_dir $h/stage0/lib
 
+        # host test dir stage0
+        make_dir $h/stage0/test
+
         # target bin dir stage0
         make_dir $h/stage0/lib/rustlib/$t/bin
 
         # target lib dir stage0
         make_dir $h/stage0/lib/rustlib/$t/lib
 
-        for i in 0 1 2 3
+        for i in 1 2 3
         do
             # host bin dir
             make_dir $h/stage$i/bin