Chore

Author: crazywhalecc

src/SPC/builder/extension/imagick.php

@@ -5,8 +5,8 @@
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\builder\linux\SystemUtil;
 use SPC\util\CustomExt;
+use SPC\util\SPCTarget;
 
 #[CustomExt('imagick')]
 class imagick extends Extension
@@ -20,7 +20,7 @@ public function getUnixConfigureArg(bool $shared = false): string
     protected function getStaticAndSharedLibs(): array
     {
         [$static, $shared] = parent::getStaticAndSharedLibs();
-        if (SystemUtil::getLibcVersionIfExists('glibc') && SystemUtil::getLibcVersionIfExists('glibc') <= '2.17') {
+        if (SPCTarget::getLibc() === 'glibc' && version_compare(SPCTarget::getLibcVersion(), '2.17', '<=')) {
             $static .= ' -lstdc++';
             $shared = str_replace('-lstdc++', '', $shared);
         }

src/SPC/builder/linux/LinuxBuilder.php

@@ -37,13 +37,6 @@ public function __construct(array $options = [])
         $this->arch_c_flags = getenv('SPC_DEFAULT_C_FLAGS');
         $this->arch_cxx_flags = getenv('SPC_DEFAULT_CXX_FLAGS');
 
-        // cross-compiling is not supported yet
-        /*if (php_uname('m') !== $this->arch) {
-            $this->cross_compile_prefix = SystemUtil::getCrossCompilePrefix($this->cc, $this->arch);
-            logger()->info('using cross compile prefix: ' . $this->cross_compile_prefix);
-            $this->configure_env .= " CROSS_COMPILE='{$this->cross_compile_prefix}'";
-        }*/
-
         // create pkgconfig and include dir (some libs cannot create them automatically)
         f_mkdir(BUILD_LIB_PATH . '/pkgconfig', recursive: true);
         f_mkdir(BUILD_INCLUDE_PATH, recursive: true);

tests/SPC/builder/linux/SystemUtilTest.php

@@ -43,16 +43,6 @@ public function testFindHeader()
         $this->assertIsArray(SystemUtil::findHeader('elf.h'));
     }
 
-    public function testGetCrossCompilePrefix()
-    {
-        $this->assertIsString(SystemUtil::getCrossCompilePrefix('gcc', 'x86_64'));
-    }
-
-    public function testGetCCType()
-    {
-        $this->assertEquals('gcc', SystemUtil::getCCType('xjfoiewjfoewof-gcc'));
-    }
-
     public function testGetSupportedDistros()
     {
         $this->assertIsArray(SystemUtil::getSupportedDistros());