cleanup

Author: tmandry

src/ci/docker/host-x86_64/x86_64-gnu-experimental/Dockerfile

@@ -21,6 +21,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   unzip \
   && rm -rf /var/lib/apt/lists/*
 
+# Copied from dist-various-2 Dockerfile.
+# TODO move to canonical triple and deduplicate this list
 ENV \
     AR_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-ar \
     CC_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang \
@@ -34,29 +36,12 @@ ENV \
     CXX_x86_64_fuchsia=x86_64-unknown-fuchsia-clang++ \
     CXXFLAGS_x86_64_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \
     LDFLAGS_x86_64_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -L/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib"
-#    AR_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-ar \
-#    CC_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang \
-#    CFLAGS_aarch64_unknown_fuchsia="--target=aarch64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/arm64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \
-#    CXX_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang++ \
-#    CXXFLAGS_aarch64_unknown_fuchsia="--target=aarch64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/arm64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \
-#    LDFLAGS_aarch64_unknown_fuchsia="--target=aarch64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/arm64/sysroot -L/usr/local/core-linux-amd64-fuchsia-sdk/arch/arm64/lib"
 
 WORKDIR /tmp
 COPY scripts/build-fuchsia-toolchain.sh /tmp/
 RUN /tmp/build-fuchsia-toolchain.sh
 
 # TODO move to canonical triple
-# TODO move to canonical triple
-ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_AR /usr/local/bin/llvm-ar
-ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS \
--C link-arg=--sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot \
--Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot/lib \
--Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib
-ENV CARGO_TARGET_AARCH64_UNKNOWN_FUCHSIA_AR /usr/local/bin/llvm-ar
-ENV CARGO_TARGET_AARCH64_UNKNOWN_FUCHSIA_RUSTFLAGS \
--C link-arg=--sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/arm64/sysroot \
--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_FUCHSIA_AR /usr/local/bin/llvm-ar
 ENV CARGO_TARGET_X86_64_FUCHSIA_RUSTFLAGS \
 -C link-arg=--sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot \
@@ -71,21 +56,15 @@ ENV CARGO_TARGET_AARCH64_FUCHSIA_RUSTFLAGS \
 ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS -Clink-arg=-static-libstdc++
 
 ENV TARGETS=x86_64-fuchsia
-#ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia
-#ENV TARGETS=$TARGETS,x86_64-fuchsia
-#ENV TARGETS=$TARGETS,aarch64-fuchsia
 ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-#RUN mkdir -p /tmp/install/etc
 ENV RUST_INSTALL_DIR /checkout/obj/install
+RUN mkdir -p $RUST_INSTALL_DIR/etc
 
-# --enable-extended --disable-docs
 ENV RUST_CONFIGURE_ARGS --prefix=$RUST_INSTALL_DIR --sysconfdir=etc --enable-lld --llvm-libunwind=in-tree --enable-extended --disable-docs
-#ENV CARGOFLAGS -Ztarget-applies-to-host
-#ENV RUSTC_BOOTSTRAP 1
 ENV SCRIPT \
     python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \
     python3 ../x.py test src/tools/cargotest

src/ci/docker/scripts/build-fuchsia-toolchain.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+
+# TODO: copied from shared.sh
 hide_output() {
   { set +x; } 2>/dev/null
   on_err="

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/5"];
+    const PICK_REFS: &[&str] = &["refs/changes/58/938058/3", "refs/changes/33/943833/6"];
 
     // This script will:
     // - create a directory named "fuchsia" if it does not exist