Merge pull request #13 from dill-lk/codex/refactor-code-for-maximum-performance-lggui1

Codex-generated pull request

Author: dill-lk

.github/workflows/build.yml

@@ -85,7 +85,24 @@ jobs:
         shell: pwsh
         run: |
           choco install mingw -y
-          echo "CXX=C:\\ProgramData\\chocolatey\\lib\\mingw\\tools\\install\\mingw64\\bin\\g++.exe" >> $env:GITHUB_ENV
+          $candidates = @(
+            "C:\\ProgramData\\chocolatey\\lib\\mingw\\tools\\install\\mingw64\\bin\\g++.exe",
+            "C:\\msys64\\mingw64\\bin\\g++.exe"
+          )
+          $found = $null
+          foreach ($c in $candidates) {
+            if (Test-Path $c) { $found = $c; break }
+          }
+          if (-not $found) {
+            $cmd = Get-Command g++ -ErrorAction SilentlyContinue
+            if ($cmd) { $found = $cmd.Source }
+          }
+          if (-not $found) {
+            throw "No g++ compiler found after MinGW install"
+          }
+          $bindir = Split-Path $found -Parent
+          echo "$bindir" >> $env:GITHUB_PATH
+          echo "CXX=$found" >> $env:GITHUB_ENV
 
       - name: Verify C++ backend availability
         run: python gravity_lang_interpreter.py backends

cpp/gravity_compiler.cpp

@@ -313,7 +313,11 @@ int main(int argc, char** argv) {
         out.close();
 
         if (!build.empty()) {
-            std::string cmd = cxx + " -O3 -std=c++17 \"" + emit + "\" -o \"" + build + "\"";
+            std::string cmd = cxx + " -O3 -std=c++17 ";
+#ifdef _WIN32
+            cmd += "-static -static-libstdc++ -static-libgcc ";
+#endif
+            cmd += "\"" + emit + "\" -o \"" + build + "\"";
             int rc = std::system(cmd.c_str());
             if (rc != 0) throw std::runtime_error("compiler failed: " + cmd);
             std::cout << "built executable: " << build << "\n";

gravity_lang_interpreter.py

@@ -2387,7 +2387,10 @@ def build_cpp_compiler_executable(name: str = "gravityc", outdir: str = "dist",
     if not source.exists():
         raise RuntimeError(f"Native compiler source not found: {source}")
 
-    cmd = [str(compiler), "-O3", "-std=c++17", str(source), "-o", str(target)]
+    cmd = [str(compiler), "-O3", "-std=c++17"]
+    if sys.platform.startswith("win"):
+        cmd += ["-static", "-static-libstdc++", "-static-libgcc"]
+    cmd += [str(source), "-o", str(target)]
     subprocess.run(cmd, check=True)
     return target
 

tests/test_interpreter.py

@@ -309,6 +309,18 @@ def test_build_cpp_compiler_executable_invokes_compiler(self):
             cmd = run_mock.call_args[0][0]
             self.assertIn("cpp/gravity_compiler.cpp", cmd)
 
+    def test_build_cpp_compiler_executable_windows_static_link_flags(self):
+        with (
+            patch("gravity_lang_interpreter.shutil.which", side_effect=["C:/mingw/bin/g++.exe"]),
+            patch("gravity_lang_interpreter.subprocess.run") as run_mock,
+            patch.object(gli.sys, "platform", "win32"),
+        ):
+            build_cpp_compiler_executable(name="gravityc-test", outdir="dist")
+            cmd = run_mock.call_args[0][0]
+            self.assertIn("-static", cmd)
+            self.assertIn("-static-libstdc++", cmd)
+            self.assertIn("-static-libgcc", cmd)
+
     def test_cli_build_cpp_exe_command(self):
         with (
             patch("gravity_lang_interpreter.build_cpp_compiler_executable", return_value=Path("dist/gravityc")),