default c++ build config tweak

tbali0524 · Feb 23, 2024 · b4afcaf · b4afcaf
1 parent 2c826c7
commit b4afcaf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.cgtest.full.php b/.cgtest.full.php
@@ -41,7 +41,6 @@
     'languages' => array_merge(PHP_OS_FAMILY != 'Windows' ? [
         // tested on Linux only
         'bash',
-        'c++',
         // 'clojure',       // untested
         // 'objective-c',   // untested
         'ocaml',            // tested on Linux only

diff --git a/.cgtest.php b/.cgtest.php
@@ -40,13 +40,13 @@
     //      Note: can be overriden via the '--lang=...' command-line option
     'languages' => array_merge(PHP_OS_FAMILY != 'Windows' ? [
         'bash',
-        'c++',
         // 'clojure',       // untested
         // 'objective-c',   // untested
         'ocaml',            // tested on Linux only
         // 'swift',         // untested
         ] : [], [
         'c',
+        'c++',
         'c#',
         'd',
         'dart',

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Show the language versions used during normal test runs with `--verbose`.
 - Github Actions updated.
+- default c++ build command on Windows include `-static-libgcc -static-libstdc++`
 
 ### Fixed
 

diff --git a/cgtest.php b/cgtest.php
@@ -121,7 +121,10 @@
         'sourceExtension' => '.sh',
         'codinGameVersion' => 'GNU bash, version 5.1.16(1)',
         'versionCommand' => 'bash --version',
-        'buildCommand' => 'chmod +x %s',
+        'buildCommand' => (PHP_OS_FAMILY != 'Windows'
+            ? 'chmod +x %s'
+            : ''
+        ),
         'runCommand' => '%s',
         'cleanPatterns' => [],
     ],
@@ -154,7 +157,10 @@
         'codinGameVersion' => 'g++ 11.2.0-20',
         'versionCommand' => 'g++ --version',
         // note: omitting -ldl -lcrypt from CG settings
-        'buildCommand' => 'g++ -lm -lpthread -m64 -std=c++17 -x c++ -o %b%p_%l.exe %s',
+        'buildCommand' => (PHP_OS_FAMILY != 'Windows'
+            ? 'g++ -lm -lpthread -m64 -std=c++17 -x c++ -o %b%p_%l.exe %s'
+            : 'g++ -static-libgcc -static-libstdc++ -lm -lpthread -m64 -std=c++17 -x c++ -o %b%p_%l.exe %s'
+        ),
         'runCommand' => '%b%p_%l.exe',
         'cleanPatterns' => ['%b%p_%l.exe'],
     ],