# instead, msys defines $MSYSTEM which is MINGW32 on i686 and
# MINGW64 on x86_64.
CFG_CPUTYPE=i686
- CFG_OSTYPE=pc-mingw32
+ CFG_OSTYPE=w64-mingw32
if [ "$MSYSTEM" = MINGW64 ]
then
CFG_CPUTYPE=x86_64
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
valopt llvm-root "" "set LLVM root"
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
-valopt libuv-root "" "set directory where libuv.a is located"
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
valopt mingw32-cross-path "" "MinGW32 cross compiler path"
valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
-valopt release-channel "source" "the name of the release channel to build"
+valopt release-channel "dev" "the name of the release channel to build"
# On windows we just store the libraries in the bin directory because
# there's no rpath. This is where the build system itself puts libraries;
# --libdir is used to configure the installation directory.
-# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
+# FIXME: This needs to parameterized over target triples. Do it in platform.mk
CFG_LIBDIR_RELATIVE=lib
if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
then
# Validate the release channel
case "$CFG_RELEASE_CHANNEL" in
- (source | nightly | beta | stable)
+ (dev | nightly | beta | stable)
;;
(*)
- err "release channel must be 'source', 'nightly', 'beta' or 'stable'"
+ err "release channel must be 'dev', 'nightly', 'beta' or 'stable'"
;;
esac
# Continue supporting the old --enable-nightly flag to transition the bots
# XXX Remove me
-if [ $CFG_ENABLE_NIGHTLY -eq 1 ]
+if [ ! -z "$CFG_ENABLE_NIGHTLY" ]
then
CFG_RELEASE_CHANNEL=nightly
putvar CFG_RELEASE_CHANNEL
if [ ! -z "$CFG_GDB" ]
then
- # Extract the version
+ # Store GDB's version
CFG_GDB_VERSION=$($CFG_GDB --version 2>/dev/null | head -1)
putvar CFG_GDB_VERSION
fi
if [ ! -z "$CFG_LLDB" ]
then
+ # Store LLDB's version
+ CFG_LLDB_VERSION=$($CFG_LLDB --version 2>/dev/null | head -1)
+ putvar CFG_LLDB_VERSION
+
# If CFG_LLDB_PYTHON_DIR is not already set from the outside and valid, try to read it from
# LLDB via the -P commandline options.
if [ -z "$CFG_LLDB_PYTHON_DIR" ] || [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
do
make_dir $t/rt/stage$s
make_dir $t/rt/jemalloc
- make_dir $t/rt/libuv
- make_dir $t/rt/libuv/src/ares
- make_dir $t/rt/libuv/src/eio
- make_dir $t/rt/libuv/src/ev
for i in \
isaac sync test \
arch/i386 arch/x86_64 arch/arm arch/mips \
make_dir $h/test/doc-guide-pointers
make_dir $h/test/doc-guide-container
make_dir $h/test/doc-guide-tasks
+ make_dir $h/test/doc-guide-plugin
make_dir $h/test/doc-rust
done
msg "git: submodule deinit src/jemalloc"
"${CFG_GIT}" submodule deinit src/jemalloc
fi
- if [ ! -z "${CFG_LIBUV_ROOT}" ]; then
- msg "git: submodule deinit src/libuv"
- "${CFG_GIT}" submodule deinit src/libuv
- fi
msg "git: submodule update"
"${CFG_GIT}" submodule update
putvar CFG_MANDIR
putvar CFG_DISABLE_INJECT_STD_VERSION
putvar CFG_JEMALLOC_ROOT
-putvar CFG_LIBUV_ROOT
putvar CFG_DISABLE_JEMALLOC
# Avoid spurious warnings from clang by feeding it original source on