Fix build and self_build in prep for new bootstrap phase

tools/build.py

@@ -38,7 +38,9 @@ def main(argv: Sequence[str]) -> int:
     else:
         tc_fpath = ROOT / 'tools/gcc-9.jsonc'
 
-    self_build(dds_exe, toolchain=str(tc_fpath))
+    self_build(dds_exe,
+               cat_json_path=ROOT / 'catalog.old.json',
+               toolchain=str(tc_fpath))
 
     return 0
 

tools/self_build.py

@@ -34,7 +34,7 @@ def self_build(exe: Path,
             new_exe,
             'build',
             f'--catalog={cat_path}',
-            f'--repo-dir=_build/ci-repo',
+            f'--repo-dir={ROOT}/_build/ci-repo',
             dds_flags,
             ('--toolchain', toolchain),
             ('-I', lmi_path) if lmi_path else (),