Skip to content

Commit 1de42ff

Browse files
mark-i-mandrehjr
authored andcommitted
cfg: linkcheck only on x86-64 linux
1 parent 7fbc6a9 commit 1de42ff

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

src/ci/docker/armhf-gnu/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
1313
git \
1414
libc6-dev \
1515
libc6-dev-armhf-cross \
16-
libssl-dev \
17-
pkg-config \
1816
make \
1917
python2.7 \
2018
qemu-system-arm \

src/ci/docker/asmjs/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14-
libssl-dev \
15-
pkg-config \
1614
xz-utils
1715

1816
COPY scripts/emscripten.sh /scripts/

src/ci/docker/i686-gnu-nopt/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14-
libssl-dev \
15-
pkg-config \
1614
xz-utils
1715

1816

src/ci/docker/i686-gnu/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14-
libssl-dev \
15-
pkg-config \
1614
xz-utils
1715

1816

src/tools/rustbook/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ edition = "2018"
77

88
[dependencies]
99
clap = "2.25.0"
10-
mdbook-linkcheck = "0.3.0"
1110
failure = "0.1"
1211

1312
[dependencies.mdbook]
@@ -20,3 +19,6 @@ package = "mdbook"
2019
version = "0.1.7"
2120
default-features = false
2221
features = ["search"]
22+
23+
[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'.dependencies]
24+
mdbook-linkcheck = "0.3.0"

src/tools/rustbook/src/main.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ use mdbook::MDBook;
1414
use mdbook::errors::{Result as Result3};
1515
use mdbook::renderer::RenderContext;
1616

17-
use mdbook_linkcheck;
18-
use mdbook_linkcheck::errors::BrokenLinks;
17+
#[cfg(all(target_arch = "x86_64", target_os = "linux"))]
18+
use mdbook_linkcheck::{self, errors::BrokenLinks};
1919
use failure::Error;
2020

21+
#[cfg(not(all(target_arch = "x86_64", target_os = "linux")))]
22+
use failure::bail;
2123

2224
fn main() {
2325
let d_message = "-d, --dest-dir=[dest-dir]
@@ -90,6 +92,7 @@ fn main() {
9092
};
9193
}
9294

95+
#[cfg(all(target_arch = "x86_64", target_os = "linux"))]
9396
pub fn linkcheck(args: &ArgMatches<'_>) -> Result<(), Error> {
9497
let book_dir = get_book_dir(args);
9598
let book = MDBook::load(&book_dir).unwrap();
@@ -99,6 +102,11 @@ pub fn linkcheck(args: &ArgMatches<'_>) -> Result<(), Error> {
99102
mdbook_linkcheck::check_links(&render_ctx)
100103
}
101104

105+
#[cfg(not(all(target_arch = "x86_64", target_os = "linux")))]
106+
pub fn linkcheck(args: &ArgMatches<'_>) -> Result<(), Error> {
107+
bail!("mdbook-linkcheck only works on x86_64 linux targets.");
108+
}
109+
102110
// Build command implementation
103111
pub fn build_1(args: &ArgMatches<'_>) -> Result1<()> {
104112
let book_dir = get_book_dir(args);

0 commit comments

Comments
 (0)