Move rustup std lib download to base-builder

google · Sep 30, 2020 · a1f71fe · a1f71fe
1 parent b314cd4
commit a1f71fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
@@ -78,6 +78,8 @@ ENV RUSTUP_HOME=/rust/rustup
 ENV PATH=$PATH:/rust/bin
 RUN curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly
 RUN cargo install cargo-fuzz
+# Needed to recompile rust std library for MSAN
+RUN rustup component add rust-src --toolchain nightly
 
 # Default build flags for various sanitizers.
 ENV SANITIZER_FLAGS_address "-fsanitize=address -fsanitize-address-use-after-scope"

diff --git a/projects/suricata/build.sh b/projects/suricata/build.sh
@@ -45,7 +45,6 @@ make install
 cd ..
 
 export CARGO_BUILD_TARGET="x86_64-unknown-linux-gnu"
-rustup component add rust-src --toolchain nightly
 
 # build project
 cd suricata