New bootstrap commits that work with FreeBSD

tools/bootstrap.py

@@ -21,9 +21,9 @@ class BootstrapPhase(NamedTuple):
 
 
 BOOTSTRAP_PHASES = [
-    BootstrapPhase('bootstrap-p1', 'g++-8', 'cl.exe'),
-    BootstrapPhase('bootstrap-p4', 'g++-8', 'cl.exe'),
-    BootstrapPhase('bootstrap-p5.1', 'g++-9', 'cl.exe'),
+    BootstrapPhase('bootstrap-p1.1', 'g++8', 'cl.exe'),
+    BootstrapPhase('bootstrap-p4.2', 'g++8', 'cl.exe'),
+    BootstrapPhase('bootstrap-p5.2', 'g++9', 'cl.exe'),
 ]
 
 HERE = Path(__file__).parent.absolute()
@@ -100,7 +100,7 @@ def _run_boot_phase(phase: BootstrapPhase) -> Path:
     return _pull_executable(bts_dir)
 
 
-def main(argv: Sequence[str]) -> int:
+def main() -> int:
     for idx, phase in enumerate(BOOTSTRAP_PHASES):
         print(f'Bootstrap phase [{idx+1}/{len(BOOTSTRAP_PHASES)}]')
         exe = _run_boot_phase(phase)
@@ -110,4 +110,4 @@ def main(argv: Sequence[str]) -> int:
 
 
 if __name__ == "__main__":
-    sys.exit(main(sys.argv[1:]))
+    sys.exit(main())

tools/freebsd-gcc-9.jsonc

@@ -0,0 +1,22 @@
+{
+    "$schema": "../res/toolchain-schema.json",
+    "compiler_id": "gnu",
+    "c_compiler": "gcc9",
+    "cxx_compiler": "g++9",
+    // "cxx_version": "c++17",
+    "flags": [
+        "-DSPDLOG_COMPILED_LIB", // Required to use a compiled spdlog
+        "-Werror=return-type",
+    ],
+    "cxx_flags": [
+        "-fconcepts",
+        "-std=c++2a",
+    ],
+    "link_flags": [
+        "-static-libgcc",
+        "-static-libstdc++",
+    ],
+    // "debug": true,
+    "optimize": true,
+    "compiler_launcher": "ccache"
+}