fi
}
-to_llvm_triple() {
- case $1 in
- i686-w64-mingw32) echo i686-pc-windows-gnu ;;
- x86_64-w64-mingw32) echo x86_64-pc-windows-gnu ;;
- *) echo $1 ;;
- esac
-}
-
to_gnu_triple() {
case $1 in
i686-pc-windows-gnu) echo i686-w64-mingw32 ;;
CFG_CONFIGURE_ARGS="$@"
-case "${CFG_SRC_DIR}" in
+case "${CFG_SRC_DIR}" in
*\ * )
err "The path to the rust source directory contains spaces, which is not supported"
;;
valopt_nosave target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples"
valopt_nosave mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
-# Temporarily support old triples until buildbots get updated
-CFG_BUILD=$(to_llvm_triple $CFG_BUILD)
-putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins.
-CFG_HOST=$(to_llvm_triple $CFG_HOST)
-CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
-
# On Windows this determines root of the subtree for target libraries.
# Host runtime libs always go to 'bin'.
valopt libdir "${CFG_PREFIX}/lib" "install libraries"
CFG_DISABLE_JEMALLOC=1
fi
+if [ $CFG_OSTYPE = pc-windows-gnu ]
+then
+ # FIXME(#31030) - there's not a great reason to disable jemalloc here
+ step_msg "on Windows, disabling jemalloc"
+ CFG_DISABLE_JEMALLOC=1
+fi
+
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
# system, so if we find that gcc is clang, we should just use clang directly.
if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]
esac
else
case $CFG_CLANG_VERSION in
- (3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7* | 3.8*)
+ (3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7* | 3.8* | 3.9*)
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
;;
(*)
;;
- *-musl)
+ x86_64-*-musl)
if [ ! -f $CFG_MUSL_ROOT/lib/libc.a ]
then
err "musl libc $CFG_MUSL_ROOT/lib/libc.a not found"
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
make_dir $h/test/debuginfo-gdb
make_dir $h/test/debuginfo-lldb
make_dir $h/test/codegen
+ make_dir $h/test/codegen-units
make_dir $h/test/rustdoc
done