Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use cfg_attr to gate musl linking #700

Closed
wants to merge 4 commits into from
Closed

Use cfg_attr to gate musl linking #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a957c59
Use cfg_attr to gate musl linking
Others Jul 25, 2017
222a6ad
Testing CI change
retep998 Jul 20, 2017
12c82f0
Fix too long lines in src/unix/mod.rs
Others Jul 26, 2017
8a3ae0f
Gate all `link` attributes behind stdbuild being enabled
Others Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ pub const INADDR_NONE: in_addr_t = 4294967295;
cfg_if! {
if #[cfg(dox)] {
// on dox builds don't pull in anything
} else if #[cfg(all(not(stdbuild), feature = "use_std"))] {
} else if #[cfg(any(not(stdbuild), feature = "use_std"))] {
// 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"))))] {
Expand Down