workaround for bee

Author: CppCXY

.github/workflows/build.yml

@@ -43,6 +43,10 @@ jobs:
         run:
           sudo snap install zig --classic --beta
 
+      - name: Prepare zig wrapper
+        if: matrix.target == 'linux'
+        run: chmod +x zig-cc-wrapper.sh
+
       - name: Build
         env:
           USE_ZIG: ${{ matrix.target == 'linux' && '1' || '0' }}

make/detect_platform.lua

@@ -24,9 +24,10 @@ elseif platform.os == 'linux' then
     -- Use Zig for Linux builds to ensure glibc 2.17 compatibility
     local use_zig = os.getenv("USE_ZIG")
     if use_zig and use_zig ~= "0" and use_zig ~= "false" then
-        -- Set compiler to zig (handles both C and C++)
-        -- Use a wrapper script to filter out -lstdc++fs which doesn't work with Zig
-        lm.cc = 'bash -c \'exec zig c++ "${@/#-lstdc++fs/}"\' --'
+        -- Set compiler to zig wrapper script that filters out -lstdc++fs
+        -- The wrapper is needed because bee.lua requires stdc++fs but Zig's libc++ already includes it
+        local wrapper = lm.workdir .. '/zig-cc-wrapper.sh'
+        lm.cc = wrapper
         lm.ar = 'zig ar'
 
         if     lm.platform == nil then

zig-cc-wrapper.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+# Wrapper script for Zig compiler to filter out -lstdc++fs
+# Zig's libc++ already includes filesystem support
+
+# Filter out -lstdc++fs from arguments
+args=()
+for arg in "$@"; do
+    if [ "$arg" != "-lstdc++fs" ]; then
+        args+=("$arg")
+    fi
+done
+
+# Call zig c++ with filtered arguments
+exec zig c++ "${args[@]}"