no core build

Author: gnzlbg

ci/build.sh

@@ -11,7 +11,8 @@ OS=${TRAVIS_OS_NAME}
 echo "Testing Rust ${RUST} on ${OS}"
 
 test_target() {
-    TARGET="${1}"
+    CARGO="${1}"
+    TARGET="${2}"
 
     opt=
     if [ "${TARGET}" = "x86_64-unknown-linux-gnux32" ]; then
@@ -22,7 +23,7 @@ test_target() {
         opt="--release"
     fi
 
-    NO_STD="${2}"
+    NO_STD="${3}"
     case ${TARGET} in
         thumbv*)
             NO_STD=1
@@ -31,43 +32,32 @@ test_target() {
 
     rustup target add "${TARGET}" --toolchain "${RUST}" || true
 
-    if [ "$NO_CORE" = 1 ]; then
-        cargo "+${RUST}" build -vv $opt --no-default-features --target "${TARGET}"
-    fi
-
     # Test that libc builds without any default features (no libstd)
-    cargo "+${RUST}" build -vv $opt --no-default-features --target "${TARGET}"
+    "$CARGO" "+${RUST}" build -vv $opt --no-default-features --target "${TARGET}"
 
     # Test that libc builds with default features (e.g. libstd)
     # if the target supports libstd
     if [ "$NO_STD" != "1" ]; then
-        cargo "+${RUST}" build -vv $opt --target "${TARGET}"
+        "$CARGO" "+${RUST}" build -vv $opt --target "${TARGET}"
     fi
 
     # Test that libc builds with the `extra_traits` feature
-    cargo "+${RUST}" build -vv $opt --no-default-features --target "${TARGET}" \
+    "$CARGO" "+${RUST}" build -vv $opt --no-default-features --target "${TARGET}" \
           --features extra_traits
 
     # Also test that it builds with `extra_traits` and default features:
     if [ "$NO_STD" != "1" ]; then
-        cargo "+${RUST}" build -vv $opt --target "${TARGET}" \
+        "$CARGO" "+${RUST}" build -vv $opt --target "${TARGET}" \
               --features extra_traits
     fi
 }
 
-RUST_LINUX_NO_CORE_TARGETS="\
-x86_64-apple-darwin
-"
-
-for TARGET in $RUST_LINUX_NO_CORE_TARGETS; do
-    if [ "${RUST}" = "nightly" ]; then
-        RUST_LIBC_NO_CORE_BUILD=1 test_target "$TARGET" 1
-    fi
-done
+rustup component add rust-src || true
+cargo install xargo || true
 
-exit 0
 
 RUST_LINUX_NO_CORE_TARGETS="\
+x86_64-unknown-dragonfly \
 aarch64-pc-windows-msvc \
 aarch64-unknown-cloudabi \
 armv7-unknown-cloudabi-eabihf \
@@ -89,13 +79,15 @@ thumbv8m.main-none-eabi \
 x86_64-pc-windows-gnu \
 x86_64-pc-windows-msvc
 x86_64-unknown-bitrig \
-x86_64-unknown-dragonfly \
 x86_64-unknown-haiku \
 x86_64-unknown-openbsd
 "
 
-
-exit 0
+for TARGET in $RUST_LINUX_NO_CORE_TARGETS; do
+    if [ "${RUST}" = "nightly" ]; then
+        RUST_LIBC_NO_CORE_BUILD=1 test_target xargo "$TARGET" 1
+    fi
+done
 
 RUST_LINUX_TARGETS="\
 aarch64-linux-android \
@@ -213,5 +205,5 @@ case "${OS}" in
 esac
 
 for TARGET in $TARGETS; do
-    test_target "$TARGET"
+    test_target cargo "$TARGET"
 done