wip

rust-lang-ci · Nov 11, 2023 · 057511f · 057511f
1 parent 234ade5
commit 057511f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-experimental/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-experimental/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
   build-essential \
-  gawk \
+  #gawk \
   g++ \
   make \
   ninja-build \
@@ -15,7 +15,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   cmake \
   libssl-dev \
   sudo \
-  time \
   xz-utils \
   pkg-config \
   unzip \
@@ -53,7 +52,7 @@ ENV CARGO_TARGET_AARCH64_FUCHSIA_RUSTFLAGS \
 -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/arm64/sysroot/lib \
 -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/arm64/lib
 
-ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS -Clink-arg=-static-libstdc++
+#ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS -Clink-arg=-static-libstdc++
 
 ENV TARGETS=x86_64-fuchsia
 ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu
@@ -64,7 +63,13 @@ RUN sh /scripts/sccache.sh
 ENV RUST_INSTALL_DIR /checkout/obj/install
 RUN mkdir -p $RUST_INSTALL_DIR/etc
 
-ENV RUST_CONFIGURE_ARGS --prefix=$RUST_INSTALL_DIR --sysconfdir=etc --enable-lld --llvm-libunwind=in-tree --enable-extended --disable-docs
+# TODO: --stage 1?
+ENV RUST_CONFIGURE_ARGS --prefix=$RUST_INSTALL_DIR --sysconfdir=etc --enable-lld --llvm-libunwind=in-tree --enable-extended --disable-docs \
+  --set target.x86_64-fuchsia.cc=/usr/local/bin/clang \
+  --set target.x86_64-fuchsia.cxx=/usr/local/bin/clang++ \
+  --set target.x86_64-fuchsia.ar=/usr/local/bin/llvm-ar \
+  --set target.x86_64-fuchsia.ranlib=/usr/local/bin/llvm-ranlib \
+  --set target.x86_64-fuchsia.linker=/usr/local/bin/ld.lld
 ENV SCRIPT \
     python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \
     python3 ../x.py test src/tools/cargotest

diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs
@@ -226,7 +226,7 @@ fn run_cargo_test(
 
 fn test_fuchsia(out_dir: &Path) {
     const INTEGRATION_SHA: &str = "06ae16d18bd8e4db9a3fc062f678a170025d9f1a";
-    const PICK_REFS: &[&str] = &["refs/changes/58/938058/3", "refs/changes/33/943833/6"];
+    const PICK_REFS: &[&str] = &["refs/changes/58/938058/3", "refs/changes/33/943833/10"];
 
     // This script will:
     // - create a directory named "fuchsia" if it does not exist