Add a build task for FreeBSD11 without LIBC_CI

4 files changed, 23 insertions, 9 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index 178f5b2469..b3d8dfb26f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,5 +1,5 @@
 task:
-  name: stable x86_64-unknown-freebsd-11
+  name: stable x86_64-unknown-freebsd
   freebsd_instance:
     image: freebsd-11-3-stable-amd64-v20190801
   setup_script:
@@ -11,6 +11,21 @@ task:
   test_script:
     - . $HOME/.cargo/env
     - sh ci/run.sh x86_64-unknown-freebsd
+
+
+task:
+  name: stable x86_64-unknown-freebsd-11
+  freebsd_instance:
+    image: freebsd-11-3-stable-amd64-v20190801
+  setup_script:
+    - pkg install -y curl
+    - curl https://sh.rustup.rs -sSf --output rustup.sh
+    - sh rustup.sh -y
+    - . $HOME/.cargo/env
+    - rustup default stable
+  test_script:
+    - . $HOME/.cargo/env
+    - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
     
 task:
   name: nightly x86_64-unknown-freebsd-12
@@ -24,4 +39,4 @@ task:
     - rustup default nightly
   test_script:
     - . $HOME/.cargo/env
-    - sh ci/run.sh x86_64-unknown-freebsd
+    - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
diff --git a/ci/azure.yml b/ci/azure.yml
index 04d12dae8f..4526361aef 100644
--- a/ci/azure.yml
+++ b/ci/azure.yml
@@ -15,7 +15,7 @@ jobs:
       vmImage: ubuntu-16.04
     steps:
       - template: azure-install-rust.yml
-      - bash: sh ./ci/run-docker.sh $TARGET
+      - bash: LIBC_CI=1 sh ./ci/run-docker.sh $TARGET
         displayName: Execute run-docker.sh
     strategy:
       matrix:
@@ -30,7 +30,7 @@ jobs:
       vmImage: ubuntu-16.04
     steps:
       - template: azure-install-rust.yml
-      - bash: sh ./ci/run-docker.sh $TARGET
+      - bash: LIBC_CI=1 sh ./ci/run-docker.sh $TARGET
         displayName: Execute run-docker.sh
     strategy:
       matrix:
@@ -88,7 +88,7 @@ jobs:
       vmImage: macos-10.14
     steps:
       - template: azure-install-rust.yml
-      - bash: sh ./ci/run.sh $TARGET
+      - bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
         displayName: Execute run.sh
     strategy:
       matrix:
@@ -100,7 +100,7 @@ jobs:
       vmImage: macos-10.13
     steps:
       - template: azure-install-rust.yml
-      - bash: sh ./ci/run.sh $TARGET
+      - bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
         displayName: Execute run.sh
     strategy:
       matrix:
@@ -112,7 +112,7 @@ jobs:
       vmImage: vs2017-win2016
     steps:
       - template: azure-install-rust.yml
-      - bash: sh ./ci/run.sh $TARGET
+      - bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
         displayName: Execute run.sh
     strategy:
       matrix:
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 5fd0061446..3c0736a265 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -23,6 +23,7 @@ run() {
     docker run \
       --rm \
       --user "$(id -u)":"$(id -g)" \
+      --env LIBC_CI \
       --env CARGO_HOME=/cargo \
       --env CARGO_TARGET_DIR=/checkout/target \
       --volume "$(dirname "$(dirname "$(command -v cargo)")")":/cargo \
diff --git a/ci/run.sh b/ci/run.sh
index 8c56979ed6..6f2ca11fe4 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -87,8 +87,6 @@ if [ "$TARGET" = "x86_64-unknown-linux-gnux32" ]; then
   opt="--release"
 fi
 
-export LIBC_CI=1
-
 cargo test -vv $opt --no-default-features --manifest-path libc-test/Cargo.toml \
       --target "${TARGET}"