Skip to content

Commit 3e0de54

Browse files
committed
Fix libcore build
1 parent b035a7e commit 3e0de54

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

ci/dox.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,24 @@ dox() {
2222
rm -rf "target/doc/${arch}"
2323
mkdir "target/doc/${arch}"
2424

25+
export RUSTFLAGS="--cfg core_arch_docs"
26+
export RUSTDOCFLAGS="--cfg core_arch_docs"
27+
2528
cargo build --verbose --target "${target}" --manifest-path crates/core_arch/Cargo.toml
2629
cargo build --verbose --target "${target}" --manifest-path crates/std_detect/Cargo.toml
2730

2831
rustdoc --verbose --target "${target}" \
2932
-o "target/doc/${arch}" crates/core_arch/src/lib.rs \
3033
--crate-name core_arch \
31-
--library-path "target/${target}/debug/deps"
34+
--library-path "target/${target}/debug/deps" \
35+
--cfg core_arch_docs
3236
rustdoc --verbose --target "${target}" \
3337
-o "target/doc/${arch}" crates/std_detect/src/lib.rs \
3438
--crate-name std_detect \
3539
--library-path "target/${target}/debug/deps" \
3640
--extern cfg_if="$(ls target/"${target}"/debug/deps/libcfg_if-*.rlib)" \
37-
--extern libc="$(ls target/"${target}"/debug/deps/liblibc-*.rlib)"
41+
--extern libc="$(ls target/"${target}"/debug/deps/liblibc-*.rlib)" \
42+
--cfg core_arch_docs
3843
}
3944

4045
dox i686 i686-unknown-linux-gnu

crates/core_arch/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ readme = "README.md"
1414
keywords = ["core", "simd", "arch", "intrinsics"]
1515
categories = ["hardware-support", "no-std"]
1616
license = "MIT/Apache-2.0"
17+
build = "build.rs"
1718

1819
[badges]
1920
travis-ci = { repository = "rust-lang-nursery/stdsimd" }

crates/core_arch/build.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
use std::env;
2-
31
fn main() {
4-
println!("cargo:rustc-env=TARGET={}", env::var("TARGET").unwrap());
5-
println!("cargo:rerurn-if-changed=build.rs");
2+
println!("cargo:rustc-cfg=core_arch_docs");
63
}

crates/core_arch/src/mod.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ mod macros;
55

66
mod simd;
77

8-
#[doc(include = "core_arch_docs.md")]
8+
#[cfg_attr(
9+
not(core_arch_docs),
10+
doc(include = "../stdsimd/crates/core_arch/src/core_arch_docs.md")
11+
)]
12+
#[cfg_attr(core_arch_docs, doc(include = "core_arch_docs.md"))]
913
#[stable(feature = "simd_arch", since = "1.27.0")]
1014
pub mod arch {
1115
/// Platform-specific intrinsics for the `x86` platform.

0 commit comments

Comments
 (0)