#!/usr/bin/env bash set -e ./y.rs build --no-unstable-features echo "[SETUP] Rust fork" git clone https://github.com/rust-lang/rust.git || true pushd rust git fetch git checkout -- . git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')" git am ../patches/*-sysroot-*.patch git apply - < Config { config.initial_cargo = config.out.join(config.build.triple).join("stage0/bin/cargo"); } + // Workaround for rustbuild bug + config.initial_rustc = PathBuf::from("$(pwd)/../build/rustc-clif"); + config.initial_cargo = PathBuf::from("$(rustup which cargo)"); + // NOTE: it's important this comes *after* we set \`initial_rustc\` just above. if config.dry_run { let dir = config.out.join("tmp-dry-run"); diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 8431aa7b818..a3ff7e68ce5 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -3489,12 +3489,7 @@ fn normalize_output(&self, output: &str, custom_rules: &[(String, String)]) -> S let compiler_src_dir = base_dir.join("compiler"); normalize_path(&compiler_src_dir, "$(echo '$COMPILER_DIR')"); - if let Some(virtual_rust_source_base_dir) = - option_env!("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR").map(PathBuf::from) - { - normalize_path(&virtual_rust_source_base_dir.join("library"), "$(echo '$SRC_DIR')"); - normalize_path(&virtual_rust_source_base_dir.join("compiler"), "$(echo '$COMPILER_DIR')"); - } + normalize_path(&Path::new("$(cd ../build_sysroot/sysroot_src/library; pwd)"), "$(echo '$SRC_DIR')"); // Paths into the build directory let test_build_dir = &self.config.build_base; EOF cat > config.toml <