From 69d0f9b8cc3c172c38e0b9c5d8265136be0d4c8f Mon Sep 17 00:00:00 2001
From: henderkes <m@pyc.ac>
Date: Fri, 29 May 2026 22:38:58 +0700
Subject: [PATCH] remove SPC_ARCH

---
 src/Package/Library/libffi.php  |  3 ++-
 src/Package/Library/libpng.php  |  3 ++-
 src/Package/Library/openssl.php | 11 +++--------
 src/globals/internal-env.php    |  1 -
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Package/Library/libffi.php b/src/Package/Library/libffi.php
index 351b9076..e40127fb 100644
--- a/src/Package/Library/libffi.php
+++ b/src/Package/Library/libffi.php
@@ -8,6 +8,7 @@ use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
+use StaticPHP\Runtime\SystemTarget;
 
 #[Library('libffi')]
 class libffi extends LibraryPackage
@@ -28,7 +29,7 @@ class libffi extends LibraryPackage
     #[BuildFor('Darwin')]
     public function buildDarwin(): void
     {
-        $arch = getenv('SPC_ARCH');
+        $arch = SystemTarget::getTargetArch();
         UnixAutoconfExecutor::create($this)
             ->configure(
                 "--host={$arch}-apple-darwin",
diff --git a/src/Package/Library/libpng.php b/src/Package/Library/libpng.php
index 6a169010..b36004d9 100644
--- a/src/Package/Library/libpng.php
+++ b/src/Package/Library/libpng.php
@@ -9,6 +9,7 @@ use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
 use StaticPHP\Runtime\Executor\WindowsCMakeExecutor;
+use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\FileSystem;
 
 #[Library('libpng')]
@@ -24,7 +25,7 @@ class libpng
         ];
 
         // Enable architecture-specific optimizations
-        match (getenv('SPC_ARCH')) {
+        match (SystemTarget::getTargetArch()) {
             'x86_64' => $args[] = '--enable-intel-sse',
             'aarch64' => $args[] = '--enable-arm-neon',
             default => null,
diff --git a/src/Package/Library/openssl.php b/src/Package/Library/openssl.php
index e0493ea5..5e580932 100644
--- a/src/Package/Library/openssl.php
+++ b/src/Package/Library/openssl.php
@@ -76,7 +76,7 @@ class openssl
     public function buildForDarwin(LibraryPackage $pkg): void
     {
         $zlib_libs = $pkg->getInstaller()->getLibraryPackage('zlib')->getStaticLibFiles();
-        $arch = getenv('SPC_ARCH');
+        $arch = SystemTarget::getTargetArch();
 
         shell()->cd($pkg->getSourceDir())->initializeEnv($pkg)
             ->exec(
@@ -95,12 +95,7 @@ class openssl
     #[BuildFor('Linux')]
     public function build(LibraryPackage $lib): void
     {
-        $arch = getenv('SPC_ARCH');
-
-        $env = "CC='" . getenv('CC') . ' -idirafter ' . BUILD_INCLUDE_PATH .
-            ' -idirafter /usr/include/ ' .
-            ' -idirafter /usr/include/' . getenv('SPC_ARCH') . '-linux-gnu/ ' .
-            "' ";
+        $arch = SystemTarget::getTargetArch();
 
         $ex_lib = trim($lib->getInstaller()->getLibraryPackage('zlib')->getStaticLibFiles()) . ' -ldl -pthread';
         $zlib_extra =
@@ -119,7 +114,7 @@ class openssl
 
         shell()->cd($lib->getSourceDir())->initializeEnv($lib)
             ->exec(
-                "{$env} ./Configure no-shared zlib " .
+                './Configure no-shared zlib ' .
                 "--prefix={$lib->getBuildRootPath()} " .
                 "--libdir={$lib->getLibDir()} " .
                 "--openssldir={$openssl_dir} " .
diff --git a/src/globals/internal-env.php b/src/globals/internal-env.php
index 97df8841..74e35200 100644
--- a/src/globals/internal-env.php
+++ b/src/globals/internal-env.php
@@ -72,7 +72,6 @@ putenv('PKG_ROOT_PATH=' . PKG_ROOT_PATH);
 putenv('SOURCE_PATH=' . SOURCE_PATH);
 putenv('DOWNLOAD_PATH=' . DOWNLOAD_PATH);
 putenv('CPU_COUNT=' . CPU_COUNT);
-putenv('SPC_ARCH=' . php_uname('m'));
 putenv('GNU_ARCH=' . GNU_ARCH);
 putenv('MAC_ARCH=' . MAC_ARCH);