Merge pull request #2025 from lzutao/use-uname-to-determine-os

build: Use uname to determine OS
rust-lang · Sep 27, 2019 · c115fd2 · c115fd2
2 parents 8a82586 + c4a8c9a
commit c115fd2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ci/run.bash b/ci/run.bash
@@ -8,9 +8,10 @@ rustc -vV
 cargo -vV
 
 FEATURES=()
-if [ "$TRAVIS_OS_NAME" != "windows" ]; then
-  FEATURES=('--features' 'vendored-openssl')
-fi
+case "$(uname -s)" in
+  *NT* ) ;; # Windows NT
+  * ) FEATURES=('--features' 'vendored-openssl') ;;
+esac
 
 # rustc only supports armv7: https://forge.rust-lang.org/platform-support.html
 if [ "$TARGET" = arm-linux-androideabi ]; then