summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ci/cargo-config13
-rwxr-xr-xci/run.sh3
2 files changed, 3 insertions, 13 deletions
diff --git a/ci/cargo-config b/ci/cargo-config
index 2e050597..6fee5be7 100644
--- a/ci/cargo-config
+++ b/ci/cargo-config
@@ -1,17 +1,4 @@
# Configuration of which linkers to call on Travis for various architectures
-
-[target.x86_64-unknown-linux-gnu]
-linker = "gcc"
-
-[target.x86_64-unknown-linux-musl]
-linker = "gcc"
-
-[target.i686-unknown-linux-gnu]
-linker = "gcc"
-
-[target.i686-unknown-linux-musl]
-linker = "gcc"
-
[target.arm-linux-androideabi]
linker = "arm-linux-androideabi-gcc"
diff --git a/ci/run.sh b/ci/run.sh
index b26c68bc..0a7039f6 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -110,6 +110,9 @@ echo "======================================================="
configure_cargo
export CC="$(cc_for_target)"
+if [ "${CC}" = "" ]; then
+ unset CC
+fi
# select the proper version
multirust override ${VERSION}