Attempt to fix musl build.

rust-lang · Oct 5, 2017 · f936be4 · f936be4
1 parent 0c1608a
commit f936be4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ services:
 install:
   - if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
 script:
-  - cargo build
-  - cargo build --no-default-features
+  - cargo build --target=$TARGET
+  - cargo build --no-default-features --target=$TARGET
   - cargo generate-lockfile --manifest-path libc-test/Cargo.toml
   - if [[ $TRAVIS_OS_NAME = "linux" ]]; then
       sh ci/run-docker.sh $TARGET;

diff --git a/src/unix/mod.rs b/src/unix/mod.rs
@@ -229,8 +229,8 @@ cfg_if! {
         // cargo build, don't pull in anything extra as the libstd dep
         // already pulls in all libs.
     } else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips"))))] {
-        #[link(name = "c", kind = "static", cfg(target_feature = "crt-static"))]
-        #[link(name = "c", cfg(not(target_feature = "crt-static")))]
+        #[cfg_attr(stdbuild, link(name = "c", kind = "static", cfg(target_feature = "crt-static")))]
+        #[cfg_attr(stdbuild, link(name = "c", cfg(not(target_feature = "crt-static"))))]
         extern {}
     } else if #[cfg(target_os = "emscripten")] {
         #[link(name = "c")]

diff --git a/src/windows.rs b/src/windows.rs
@@ -160,8 +160,8 @@ pub const STRUNCATE: ::c_int = 80;
 
 // inline comment below appeases style checker
 #[cfg(all(target_env = "msvc", feature = "stdbuild"))] // " if "
-#[link(name = "msvcrt", cfg(not(target_feature = "crt-static")))]
-#[link(name = "libcmt", cfg(target_feature = "crt-static"))]
+#[cfg_attr(stdbuild, link(name = "msvcrt", cfg(not(target_feature = "crt-static"))))]
+#[cfg_attr(stdbuild, link(name = "libcmt", cfg(target_feature = "crt-static")))]
 extern {}
 
 extern {