diff --git a/src/etc/rustup.sh b/src/etc/rustup.sh
deleted file mode 100755
index 7c207385393..00000000000
--- a/src/etc/rustup.sh
+++ /dev/null
@@ -1,615 +0,0 @@
-#!/bin/sh
-# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-# file at the top-level directory of this distribution and at
-# http://rust-lang.org/COPYRIGHT.
-#
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
-
-
-msg() {
-    echo "rustup: $1"
-}
-
-step_msg() {
-    msg
-    msg "$1"
-    msg
-}
-
-warn() {
-    echo "rustup: WARNING: $1"
-}
-
-err() {
-    echo "rustup: error: $1"
-    exit 1
-}
-
-need_ok() {
-    if [ $? -ne 0 ]
-    then
-        err "$1"
-    fi
-}
-
-
-putvar() {
-    local T
-    eval T=\$$1
-    eval TLEN=\${#$1}
-    if [ $TLEN -gt 35 ]
-    then
-        printf "rustup: %-20s := %.35s ...\n" $1 "$T"
-    else
-        printf "rustup: %-20s := %s %s\n" $1 "$T" "$2"
-    fi
-}
-
-probe() {
-    local V=$1
-    shift
-    local P
-    local T
-    for P
-    do
-        T=$(which $P 2>&1)
-        if [ $? -eq 0 ]
-        then
-            VER0=$($P --version 2>/dev/null | head -1 \
-                |  sed -e 's/[^0-9]*\([vV]\?[0-9.]\+[^ ]*\).*/\1/' )
-            if [ $? -eq 0 -a "x${VER0}" != "x" ]
-            then
-              VER="($VER0)"
-            else
-              VER=""
-            fi
-            break
-        else
-            VER=""
-            T=""
-        fi
-    done
-    eval $V=\$T
-    putvar $V "$VER"
-}
-
-probe_need() {
-    local V=$1
-    probe $*
-    eval VV=\$$V
-    if [ -z "$VV" ]
-    then
-        err "needed, but unable to find any of: $*"
-    fi
-}
-
-
-valopt() {
-    VAL_OPTIONS="$VAL_OPTIONS $1"
-
-    local OP=$1
-    local DEFAULT=$2
-    shift
-    shift
-    local DOC="$*"
-    if [ $HELP -eq 0 ]
-    then
-        local UOP=$(echo $OP | tr '[:lower:]' '[:upper:]' | tr '\-' '\_')
-        local V="CFG_${UOP}"
-        eval $V="$DEFAULT"
-        for arg in $CFG_ARGS
-        do
-            if echo "$arg" | grep -q -- "--$OP="
-            then
-                val=$(echo "$arg" | cut -f2 -d=)
-                eval $V=$val
-            fi
-        done
-        putvar $V
-    else
-        if [ -z "$DEFAULT" ]
-        then
-            DEFAULT="<none>"
-        fi
-        OP="${OP}=[${DEFAULT}]"
-        printf "    --%-30s %s\n" "$OP" "$DOC"
-    fi
-}
-
-opt() {
-    BOOL_OPTIONS="$BOOL_OPTIONS $1"
-
-    local OP=$1
-    local DEFAULT=$2
-    shift
-    shift
-    local DOC="$*"
-    local FLAG=""
-
-    if [ $DEFAULT -eq 0 ]
-    then
-        FLAG="enable"
-    else
-        FLAG="disable"
-        DOC="don't $DOC"
-    fi
-
-    if [ $HELP -eq 0 ]
-    then
-        for arg in $CFG_ARGS
-        do
-            if [ "$arg" = "--${FLAG}-${OP}" ]
-            then
-                OP=$(echo $OP | tr 'a-z-' 'A-Z_')
-                FLAG=$(echo $FLAG | tr 'a-z' 'A-Z')
-                local V="CFG_${FLAG}_${OP}"
-                eval $V=1
-                putvar $V
-            fi
-        done
-    else
-        if [ ! -z "$META" ]
-        then
-            OP="$OP=<$META>"
-        fi
-        printf "    --%-30s %s\n" "$FLAG-$OP" "$DOC"
-     fi
-}
-
-flag() {
-    BOOL_OPTIONS="$BOOL_OPTIONS $1"
-
-    local OP=$1
-    shift
-    local DOC="$*"
-
-    if [ $HELP -eq 0 ]
-    then
-        for arg in $CFG_ARGS
-        do
-            if [ "$arg" = "--${OP}" ]
-            then
-                OP=$(echo $OP | tr 'a-z-' 'A-Z_')
-                local V="CFG_${OP}"
-                eval $V=1
-                putvar $V
-            fi
-        done
-    else
-        if [ ! -z "$META" ]
-        then
-            OP="$OP=<$META>"
-        fi
-        printf "    --%-30s %s\n" "$OP" "$DOC"
-     fi
-}
-
-validate_opt() {
-    for arg in $CFG_ARGS
-    do
-        isArgValid=0
-        for option in $BOOL_OPTIONS
-        do
-            if test --disable-$option = $arg
-            then
-                isArgValid=1
-            fi
-            if test --enable-$option = $arg
-            then
-                isArgValid=1
-            fi
-            if test --$option = $arg
-            then
-                isArgValid=1
-            fi
-        done
-        for option in $VAL_OPTIONS
-        do
-            if echo "$arg" | grep -q -- "--$option="
-            then
-                isArgValid=1
-            fi
-        done
-        if [ "$arg" = "--help" ]
-        then
-            echo
-            echo "No more help available for Configure options,"
-            echo "check the Wiki or join our IRC channel"
-            break
-        else
-            if test $isArgValid -eq 0
-            then
-                err "Option '$arg' is not recognized"
-            fi
-        fi
-    done
-}
-
-create_tmp_dir() {
-    local TMP_DIR=`pwd`/rustup-tmp-install
-
-    rm -Rf "${TMP_DIR}"
-    need_ok "failed to remove temporary installation directory"
-
-    mkdir -p "${TMP_DIR}"
-    need_ok "failed to create create temporary installation directory"
-
-    echo $TMP_DIR
-}
-
-# Make `tr` locale independent
-LC_CTYPE=C
-
-probe_need CFG_CURL  curl
-probe_need CFG_TAR   tar
-probe_need CFG_FILE  file
-
-probe CFG_SHA256SUM sha256sum
-probe CFG_SHASUM shasum
-
-if [ -z "$CFG_SHA256SUM" -a -z "$CFG_SHASUM" ]; then
-    err "unable to find either sha256sum or shasum"
-fi
-
-calculate_hash() {
-    if [ -n "$CFG_SHA256SUM" ]; then
-        ${CFG_SHA256SUM} $@
-    else
-        ${CFG_SHASUM} -a 256 $@
-    fi
-}
-
-CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
-CFG_SELF="$0"
-CFG_ARGS="$@"
-
-HELP=0
-if [ "$1" = "--help" ]
-then
-    HELP=1
-    shift
-    echo
-    echo "Usage: $CFG_SELF [options]"
-    echo
-    echo "Options:"
-    echo
-else
-    step_msg "processing $CFG_SELF args"
-fi
-
-OPTIONS=""
-BOOL_OPTIONS=""
-VAL_OPTIONS=""
-
-flag uninstall "only uninstall from the installation prefix"
-valopt prefix "${RUSTUP_PREFIX}" "set installation prefix"
-valopt date "" "use the YYYY-MM-DD nightly instead of the current nightly"
-valopt channel "beta" "use the selected release channel [beta]"
-flag save "save the downloaded nightlies to ~/.rustup"
-
-if [ $HELP -eq 1 ]
-then
-    echo
-    exit 0
-fi
-
-step_msg "validating $CFG_SELF args"
-validate_opt
-
-
-# Platform detection copied from `configure`
-
-CFG_OSTYPE=$(uname -s)
-CFG_CPUTYPE=$(uname -m)
-
-if [ $CFG_OSTYPE = Darwin -a $CFG_CPUTYPE = i386 ]
-then
-    # Darwin's `uname -m` lies and always returns i386. We have to use sysctl
-    # instead.
-    if sysctl hw.optional.x86_64 | grep -q ': 1'
-    then
-        CFG_CPUTYPE=x86_64
-    fi
-fi
-
-# The goal here is to come up with the same triple as LLVM would,
-# at least for the subset of platforms we're willing to target.
-
-case $CFG_OSTYPE in
-
-    Linux)
-        CFG_OSTYPE=unknown-linux-gnu
-        ;;
-
-    FreeBSD)
-        CFG_OSTYPE=unknown-freebsd
-        ;;
-
-    Darwin)
-        CFG_OSTYPE=apple-darwin
-        ;;
-
-    MINGW32*)
-        CFG_OSTYPE=pc-mingw32
-        ;;
-# Thad's Cygwin identifiers below
-
-#   Vista 32 bit
-    CYGWIN_NT-6.0)
-        CFG_OSTYPE=pc-mingw32
-        CFG_CPUTYPE=i686
-        ;;
-
-#   Vista 64 bit
-    CYGWIN_NT-6.0-WOW64)
-        CFG_OSTYPE=w64-mingw32
-        CFG_CPUTYPE=x86_64
-        ;;
-
-#   Win 7 32 bit
-    CYGWIN_NT-6.1)
-        CFG_OSTYPE=pc-mingw32
-        CFG_CPUTYPE=i686
-        ;;
-
-#   Win 7 64 bit
-    CYGWIN_NT-6.1-WOW64)
-        CFG_OSTYPE=w64-mingw32
-        CFG_CPUTYPE=x86_64
-        ;;
-
-# We do not detect other OS such as XP/2003 using 64 bit using uname.
-# If we want to in the future, we will need to use Cygwin
-# Chuck's csih helper in /usr/lib/csih/winProductName.exe or alternative.
-    *)
-        err "unknown OS type: $CFG_OSTYPE"
-        ;;
-esac
-
-
-case $CFG_CPUTYPE in
-
-    i386 | i486 | i686 | i786 | x86)
-        CFG_CPUTYPE=i686
-        ;;
-
-    xscale | arm)
-        CFG_CPUTYPE=arm
-        ;;
-
-    x86_64 | x86-64 | x64 | amd64)
-        CFG_CPUTYPE=x86_64
-        ;;
-
-    *)
-        err "unknown CPU type: $CFG_CPUTYPE"
-esac
-
-# Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation
-if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ]
-then
-    "${CFG_FILE}" -L "$SHELL" | grep -q "x86[_-]64"
-    if [ $? != 0 ]; then
-        CFG_CPUTYPE=i686
-    fi
-fi
-
-HOST_TRIPLE="${CFG_CPUTYPE}-${CFG_OSTYPE}"
-
-# Is this a triple we have nightlies for?
-case $HOST_TRIPLE in
-
-        x86_64-unknown-linux-gnu)
-                ;;
-
-        i686-unknown-linux-gnu)
-                ;;
-
-        x86_64-apple-darwin)
-                ;;
-
-        i686-apple-darwin)
-                ;;
-
-        *)
-                err "rustup.sh doesn't work for host $HOST_TRIPLE"
-
-esac
-
-msg "host triple: ${HOST_TRIPLE}"
-
-CFG_INSTALL_FLAGS=""
-if [ -n "${CFG_UNINSTALL}" ]
-then
-    CFG_INSTALL_FLAGS="${CFG_INSTALL_FLAGS} --uninstall"
-fi
-
-if [ -n "${CFG_PREFIX}" ]
-then
-    CFG_INSTALL_FLAGS="${CFG_INSTALL_FLAGS} --prefix=${CFG_PREFIX}"
-fi
-
-CFG_TMP_DIR=$(mktemp -d 2>/dev/null \
-           || mktemp -d -t 'rustup-tmp-install' 2>/dev/null \
-           || create_tmp_dir)
-
-# If we're saving nightlies and we didn't specify which one, grab the latest
-# version from the perspective of the server. Buildbot has typically finished
-# building and uploading by ~8UTC, but we want to include a little buffer.
-#
-# FIXME It would be better to use the known most recent nightly that has been
-# built. This is waiting on a change to have buildbot publish metadata that
-# can be queried.
-if [ -n "${CFG_SAVE}" -a -z "${CFG_DATE}" ];
-then
-    CFG_DATE=`TZ=Etc/UTC+9 date "+%Y-%m-%d"`
-fi
-
-RUST_URL="https://static.rust-lang.org/dist"
-case "$CFG_CHANNEL" in
-    nightly)
-        # add a date suffix if we want a particular nightly.
-        if [ -n "${CFG_DATE}" ];
-        then
-            RUST_URL="${RUST_URL}/${CFG_DATE}"
-        fi
-
-        RUST_PACKAGE_NAME=rust-nightly
-        ;;
-    beta)
-        RUST_PACKAGE_NAME=rust-1.0.0-beta
-        ;;
-    *)
-        err "Currently 'beta' and 'nightly' are the only supported channels"
-esac
-
-RUST_PACKAGE_NAME_AND_TRIPLE="${RUST_PACKAGE_NAME}-${HOST_TRIPLE}"
-RUST_TARBALL_NAME="${RUST_PACKAGE_NAME_AND_TRIPLE}.tar.gz"
-RUST_LOCAL_INSTALL_DIR="${CFG_TMP_DIR}/${RUST_PACKAGE_NAME_AND_TRIPLE}"
-RUST_LOCAL_INSTALL_SCRIPT="${RUST_LOCAL_INSTALL_DIR}/install.sh"
-
-download_hash() {
-    msg "Downloading ${remote_sha256}"
-    remote_sha256=`"${CFG_CURL}" -f "${remote_sha256}"`
-    if [ -n "${CFG_SAVE}" ]; then
-        echo "${remote_sha256}" > "${local_sha_file}"
-    fi
-    if [ "$?" -ne 0 ]; then
-        rm -Rf "${CFG_TMP_DIR}"
-        err "Failed to download ${remote_url}"
-    fi
-}
-
-verify_hash() {
-    remote_sha256="$1"
-    local_file="$2"
-    local_sha_file="${local_file}.sha256"
-
-    if [ -n "${CFG_SAVE}" ]; then
-        if [ -f "${local_sha_file}" ]; then
-            msg "Local ${local_sha_file} exists, treating as remote hash"
-            remote_sha256=`cat "${local_sha_file}"`
-        else
-            download_hash
-        fi
-    else
-        download_hash
-    fi
-
-    msg "Verifying hash"
-    local_sha256=$(calculate_hash "${local_file}")
-    if [ "$?" -ne 0 ]; then
-        rm -Rf "${CFG_TMP_DIR}"
-        err "Failed to compute hash for ${local_tarball}"
-    fi
-
-    # We only need the sha, not the filenames
-    remote_sha256=`echo ${remote_sha256} | cut -f 1 -d ' '`
-    local_sha256=`echo ${local_sha256} | cut -f 1 -d ' '`
-
-    if [ "${remote_sha256}" != "${local_sha256}" ]; then
-        rm -Rf "${CFG_TMP_DIR}"
-        errmsg="invalid sha256.\n"
-        errmsg="$errmsg ${remote_sha256}\t${remote_tarball}\n"
-        errmsg="$errmsg ${local_sha256}\t${local_tarball}"
-        err "$errmsg"
-    fi
-}
-
-# Fetch the package. Optionally caches the tarballs.
-download_package() {
-    remote_tarball="$1"
-    local_tarball="$2"
-    remote_sha256="${remote_tarball}.sha256"
-
-    # Check if we've already downloaded this file.
-    if [ -e "${local_tarball}.tmp" ]; then
-        msg "Resuming ${remote_tarball} to ${local_tarball}"
-
-        "${CFG_CURL}" -f -C - -o "${local_tarball}.tmp" "${remote_tarball}"
-        if [ $? -ne 0 ]
-        then
-            rm -Rf "${CFG_TMP_DIR}"
-            err "failed to download installer"
-        fi
-
-        mv "${local_tarball}.tmp" "${local_tarball}"
-    elif [ ! -e "${local_tarball}" ]; then
-        msg "Downloading ${remote_tarball} to ${local_tarball}"
-
-        "${CFG_CURL}" -f -o "${local_tarball}.tmp" "${remote_tarball}"
-        if [ $? -ne 0 ]
-        then
-            rm -Rf "${CFG_TMP_DIR}"
-            err "failed to download installer"
-        fi
-
-        mv "${local_tarball}.tmp" "${local_tarball}"
-    fi
-
-    verify_hash "${remote_sha256}" "${local_tarball}"
-}
-
-# Wrap all the commands needed to install a package.
-install_package() {
-    local_tarball="$1"
-    install_script="$2"
-
-    msg "Extracting ${local_tarball}"
-    (cd "${CFG_TMP_DIR}" && "${CFG_TAR}" -xzf "${local_tarball}")
-    if [ $? -ne 0 ]; then
-        rm -Rf "${CFG_TMP_DIR}"
-        err "failed to unpack installer"
-    fi
-
-    sh "${install_script}" "${CFG_INSTALL_FLAGS}"
-    if [ $? -ne 0 ]
-    then
-        rm -Rf "${CFG_TMP_DIR}"
-        err "failed to install Rust"
-    fi
-}
-
-# It's possible that curl could be interrupted partway though downloading
-# `rustup.sh`, truncating the file. This could be especially bad if we were in
-# the middle of a line that would run "rm -rf ". To protect against this, we
-# wrap up the `rustup.sh` destructive functionality in this helper function,
-# which we call as the last thing we do. This means we will not do anything
-# unless we have the entire file downloaded.
-install_packages() {
-    rm -Rf "${CFG_TMP_DIR}"
-    need_ok "failed to remove temporary installation directory"
-
-    mkdir -p "${CFG_TMP_DIR}"
-    need_ok "failed to create create temporary installation directory"
-
-    # If we're saving our nightlies, put them in $HOME/.rustup.
-    if [ -n "${CFG_SAVE}" ]
-    then
-        RUST_DOWNLOAD_DIR="${HOME}/.rustup/${CFG_DATE}"
-    else
-        RUST_DOWNLOAD_DIR="${CFG_TMP_DIR}"
-    fi
-
-    mkdir -p "${RUST_DOWNLOAD_DIR}"
-    need_ok "failed to create create download directory"
-
-    RUST_LOCAL_TARBALL="${RUST_DOWNLOAD_DIR}/${RUST_TARBALL_NAME}"
-
-    download_package \
-        "${RUST_URL}/${RUST_TARBALL_NAME}" \
-        "${RUST_LOCAL_TARBALL}"
-
-    install_package \
-        "${RUST_LOCAL_TARBALL}" \
-        "${RUST_LOCAL_INSTALL_SCRIPT}"
-
-    rm -Rf "${CFG_TMP_DIR}"
-    need_ok "couldn't rm temporary installation directory"
-}
-
-install_packages