diff --git a/src/SPC/builder/extension/imagick.php b/src/SPC/builder/extension/imagick.php
index 0fda41ea..a548a8a3 100644
--- a/src/SPC/builder/extension/imagick.php
+++ b/src/SPC/builder/extension/imagick.php
@@ -21,7 +21,9 @@ class imagick extends Extension
     protected function splitLibsIntoStaticAndShared(string $allLibs): array
     {
         [$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
-        if (ToolchainManager::getToolchainClass() !== ZigToolchain::class && str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
+        if (ToolchainManager::getToolchainClass() !== ZigToolchain::class &&
+            (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset'))
+        ) {
             $static .= ' -l:libstdc++.a';
             $shared = str_replace('-lstdc++', '', $shared);
         }
diff --git a/src/SPC/builder/unix/library/libwebp.php b/src/SPC/builder/unix/library/libwebp.php
index 2ad616e0..88a07f8c 100644
--- a/src/SPC/builder/unix/library/libwebp.php
+++ b/src/SPC/builder/unix/library/libwebp.php
@@ -10,12 +10,9 @@ trait libwebp
 {
     protected function build(): void
     {
-        $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
-        $has_avx2 = str_contains($cflags, '-mavx2') || str_contains($cflags, '-march=x86-64-v2') || str_contains($cflags, '-march=x86-64-v3');
         UnixCMakeExecutor::create($this)
             ->addConfigureArgs(
-                '-DWEBP_BUILD_EXTRAS=OFF',
-                '-DWEBP_ENABLE_SIMD=' . ($has_avx2 ? 'ON' : 'OFF'),
+                '-DWEBP_BUILD_EXTRAS=OFF'
             )
             ->build();
         // patch pkgconfig