Fix fuzz/bench Linux build paths and modules

ppyne · ppyne · commit cc671dc6b0fc · 2026-03-09T15:03:56.000+01:00
diff --git a/tools/bench-runner b/tools/bench-runner
@@ -22,8 +22,11 @@ EMIT_C_CC_FLAGS = [
     "-Wall",
     "-Wextra",
     "-Wpedantic",
+    "-Wno-pedantic",
     "-Werror",
     "-Wno-unused-function",
+    "-D_POSIX_C_SOURCE=200809L",
+    "-D_GNU_SOURCE",
     "-x",
     "c",
 ]
@@ -60,7 +63,7 @@ def emit_c_compile_once(case_path: str, out_dir: Path, out_name: str) -> tuple[b
         return (False, 0.0, bin_path)
 
     cc = subprocess.run(
-        ["cc", *EMIT_C_CC_FLAGS, str(c_path), "-o", str(bin_path)],
+        ["cc", *EMIT_C_CC_FLAGS, str(c_path), "-o", str(bin_path), "-lm"],
         cwd=str(ROOT),
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
@@ -169,6 +172,27 @@ def main() -> int:
     parser.add_argument("--superlinear-factor", type=float, default=4.0, help="Max growth ratio for 2x scale tests.")
     args = parser.parse_args()
 
+    modules_tmp: str | None = None
+    if not os.environ.get("PS_MODULE_PATH"):
+        modules_tmp = tempfile.mkdtemp(prefix="ps_bench_modules_")
+        os.environ["PS_MODULE_PATH"] = modules_tmp
+    build_script = ROOT / "scripts" / "build_modules.sh"
+    if build_script.exists():
+        build = subprocess.run(
+            [str(build_script)],
+            cwd=str(ROOT),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+        )
+        if build.returncode != 0:
+            print("ERROR: failed to build test modules", file=sys.stderr)
+            sys.stderr.write(build.stdout)
+            sys.stderr.write(build.stderr)
+            if modules_tmp:
+                shutil.rmtree(modules_tmp, ignore_errors=True)
+            return 2
+
     repeats = 2 if args.quick or not args.full else 5
     ensure_c_bins()
     REPORT_DIR.mkdir(parents=True, exist_ok=True)
@@ -299,6 +323,8 @@ def main() -> int:
         )
 
     print(f"Summary: PASS={pass_count} FAIL={fail_count} TOTAL={pass_count + fail_count}")
+    if modules_tmp:
+        shutil.rmtree(modules_tmp, ignore_errors=True)
     return 0 if fail_count == 0 else 1
 
 
diff --git a/tools/fuzz-runner b/tools/fuzz-runner
@@ -9,13 +9,16 @@ import subprocess
 import sys
 import time
 from pathlib import Path
+import platform
 
 
 ROOT = Path(__file__).resolve().parent.parent
 REPORT_DIR = ROOT / "reports" / "fuzz"
 BIN_DIR = ROOT / "tests" / "fuzz" / "bin"
 FINDINGS_RAW = ROOT / "tests" / "fuzz" / "findings" / "raw"
 MCPP_LIB = ROOT / "third_party" / "mcpp" / "lib" / "libmcpp.a"
+if platform.system() == "Linux":
+    MCPP_LIB = ROOT / "third_party" / "mcpp" / "lib64" / "libmcpp.a"
 
 
 TARGETS = [
@@ -88,6 +91,7 @@ def build_target(target: dict[str, Path | str], clang: str, cflags: list[str], l
         *COMMON_SRCS,
         str(MCPP_LIB),
         "-ldl",
+        "-lm",
         "-o",
         str(bin_path),
     ]
@@ -125,6 +129,8 @@ def main() -> int:
         "-fsanitize=fuzzer,address,undefined",
         "-Wall",
         "-Wextra",
+        "-D_POSIX_C_SOURCE=200809L",
+        "-D_GNU_SOURCE",
     ]
 
     pass_count = 0
