rustbuild: Don't make any directories when enabled

As part of the ./configure step don't create any directories if rustbuild is
enable as rustbuild will take care of everything.
This commit is contained in:
Alex Crichton 2016-02-12 16:40:06 -08:00
parent 0c4d81f9bc
commit 680bdbc2a7
1 changed files with 78 additions and 74 deletions

152
configure vendored
View File

@ -1327,97 +1327,101 @@ then
fi fi
fi fi
step_msg "making directories" if [ -z "$CFG_ENABLE_RUSTBUILD" ]; then
for i in \ step_msg "making directories"
doc doc/std doc/extra \
dl tmp dist
do
make_dir $i
done
for t in $CFG_HOST for i in \
do doc doc/std doc/extra \
make_dir $t/llvm dl tmp dist
done
for t in $CFG_HOST
do
make_dir $t/rustllvm
done
for t in $CFG_TARGET
do
make_dir $t/rt
for s in 0 1 2 3
do do
make_dir $t/rt/stage$s make_dir $i
make_dir $t/rt/jemalloc done
make_dir $t/rt/compiler-rt
for i in \ for t in $CFG_HOST
isaac sync test \ do
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc make_dir $t/llvm
done
for t in $CFG_HOST
do
make_dir $t/rustllvm
done
for t in $CFG_TARGET
do
make_dir $t/rt
for s in 0 1 2 3
do do
make_dir $t/rt/stage$s/$i make_dir $t/rt/stage$s
make_dir $t/rt/jemalloc
make_dir $t/rt/compiler-rt
for i in \
isaac sync test \
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc
do
make_dir $t/rt/stage$s/$i
done
done done
done done
done
for h in $CFG_HOST for h in $CFG_HOST
do do
for t in $CFG_TARGET for t in $CFG_TARGET
do do
# host bin dir stage0 # host bin dir stage0
make_dir $h/stage0/bin make_dir $h/stage0/bin
# host lib dir stage0 # host lib dir stage0
make_dir $h/stage0/lib make_dir $h/stage0/lib
# host test dir stage0 # host test dir stage0
make_dir $h/stage0/test make_dir $h/stage0/test
# target bin dir stage0 # target bin dir stage0
make_dir $h/stage0/lib/rustlib/$t/bin make_dir $h/stage0/lib/rustlib/$t/bin
# target lib dir stage0 # target lib dir stage0
make_dir $h/stage0/lib/rustlib/$t/lib make_dir $h/stage0/lib/rustlib/$t/lib
for i in 1 2 3 for i in 1 2 3
do do
# host bin dir # host bin dir
make_dir $h/stage$i/bin make_dir $h/stage$i/bin
# host lib dir # host lib dir
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE
# host test dir # host test dir
make_dir $h/stage$i/test make_dir $h/stage$i/test
# target bin dir # target bin dir
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/bin make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/bin
# target lib dir # target lib dir
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/lib make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/lib
done done
done done
make_dir $h/test/run-pass make_dir $h/test/run-pass
make_dir $h/test/run-pass-valgrind make_dir $h/test/run-pass-valgrind
make_dir $h/test/run-pass-fulldeps make_dir $h/test/run-pass-fulldeps
make_dir $h/test/run-fail make_dir $h/test/run-fail
make_dir $h/test/run-fail-fulldeps make_dir $h/test/run-fail-fulldeps
make_dir $h/test/compile-fail make_dir $h/test/compile-fail
make_dir $h/test/parse-fail make_dir $h/test/parse-fail
make_dir $h/test/compile-fail-fulldeps make_dir $h/test/compile-fail-fulldeps
make_dir $h/test/bench make_dir $h/test/bench
make_dir $h/test/perf make_dir $h/test/perf
make_dir $h/test/pretty make_dir $h/test/pretty
make_dir $h/test/debuginfo-gdb make_dir $h/test/debuginfo-gdb
make_dir $h/test/debuginfo-lldb make_dir $h/test/debuginfo-lldb
make_dir $h/test/codegen make_dir $h/test/codegen
make_dir $h/test/codegen-units make_dir $h/test/codegen-units
make_dir $h/test/rustdoc make_dir $h/test/rustdoc
done done
fi
# Configure submodules # Configure submodules
step_msg "configuring submodules" step_msg "configuring submodules"