From 4b783f3c2d024dec21cbe466d2247f8705130799 Mon Sep 17 00:00:00 2001 From: vector-of-bool Date: Tue, 10 Dec 2019 21:50:15 -0700 Subject: [PATCH] Don't forget exe suffix when bootstrapping --- tools/bootstrap.py | 2 +- tools/build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bootstrap.py b/tools/bootstrap.py index d2f88d04..e26ea05a 100644 --- a/tools/bootstrap.py +++ b/tools/bootstrap.py @@ -68,7 +68,7 @@ def _clone_bootstrap_phase(ref: str) -> Path: def _build_bootstrap_phase(ph: BootstrapPhase, bts_dir: Path) -> None: print(f'Build revision: {ph.ref} [This may take a moment]') env = os.environ.copy() - env['DDS_BOOTSTRAP_PREV_EXE'] = str(PREBUILT_DIR / 'dds') + env['DDS_BOOTSTRAP_PREV_EXE'] = str(PREBUILT_DIR / F'dds{EXE_SUFFIX}') _run_quiet( [ sys.executable, diff --git a/tools/build.py b/tools/build.py index 4347c2a1..62769099 100755 --- a/tools/build.py +++ b/tools/build.py @@ -38,7 +38,7 @@ def main(argv: Sequence[str]) -> int: if os.name == 'nt': tc_fpath = ROOT / 'tools/msvc.dds' else: - tc_fpath = ROOT / 'gcc-9.dds' + tc_fpath = ROOT / 'tools/gcc-9.dds' self_deps_build(dds_exe, str(tc_fpath), paths.SELF_TEST_REPO_DIR, ROOT / 'remote.dds')