PHP build scripts: Fix always using Clang for Soup

PlutoLang · Aug 30, 2024 · f300a6c · f300a6c
1 parent 2335598
commit f300a6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/scripts/common.php b/scripts/common.php
@@ -8,8 +8,10 @@
 
 function build_soup()
 {
+	global $argv;
+
 	echo ">>> Building Soup\n";
-	passthru("php ".__DIR__."/../src/vendor/Soup/build_lib.php");
+	passthru("php ".__DIR__."/../src/vendor/Soup/build_lib.php "..escapeshellarg($argv[1]));
 	echo ">>> Compiling Pluto\n";
 }
 

diff --git a/src/vendor/Soup/build_common.php b/src/vendor/Soup/build_common.php
@@ -1,6 +1,7 @@
 <?php
 // Config
-$clang = "clang -std=c++17 -fno-rtti -DSOUP_USE_INTRIN -O3";
+$clang = $argv[1] ?? "clang";
+$clang .= " -std=c++17 -fno-rtti -DSOUP_USE_INTRIN -O3";
 if (defined("PHP_WINDOWS_VERSION_MAJOR"))
 {
 	$clang .= " -D_CRT_SECURE_NO_WARNINGS";