From 944d7acf65100e4915444be730acfeba2592f8a6 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sat, 29 Mar 2025 18:56:38 +0800 Subject: [PATCH] Revert for test --- src/SPC/builder/extension/imagick.php | 8 +------- src/SPC/util/SPCConfigUtil.php | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/SPC/builder/extension/imagick.php b/src/SPC/builder/extension/imagick.php index 5de6beb9..941498c6 100644 --- a/src/SPC/builder/extension/imagick.php +++ b/src/SPC/builder/extension/imagick.php @@ -21,13 +21,7 @@ class imagick extends Extension $extra_libs = trim($extra_libs . ' -lgomp'); } if (getenv('SPC_LIBC') === 'glibc') { - $ld = f_exec('/usr/bin/gcc --print-file-name=libgomp.a', $output, $result_code); - if ($result_code !== 0) { - logger()->error('Cannot find libgomp.a, please install libgomp-dev'); - $extra_libs = trim($extra_libs . ' -l:libgomp.a'); - } else { - $extra_libs = trim($extra_libs . ' ' . $ld); - } + $extra_libs = trim($extra_libs . ' -l:libgomp.a'); } f_putenv('SPC_EXTRA_LIBS=' . $extra_libs); return true; diff --git a/src/SPC/util/SPCConfigUtil.php b/src/SPC/util/SPCConfigUtil.php index a99ee558..ba498d4a 100644 --- a/src/SPC/util/SPCConfigUtil.php +++ b/src/SPC/util/SPCConfigUtil.php @@ -93,13 +93,7 @@ class SPCConfigUtil // patch: imagick (imagemagick wrapper) for linux needs -lgomp if (in_array('imagemagick', $libraries) && PHP_OS_FAMILY === 'Linux') { if (getenv('SPC_LIBC') === 'glibc') { - $ld = f_exec('/usr/bin/gcc --print-file-name=libgomp.a', $output, $result_code); - if ($result_code !== 0) { - // logger()->error('Cannot find libgomp.a, please install libgomp-dev'); - $short_name[] = '-l:libgomp.a'; - } else { - $short_name[] = $ld; - } + $short_name[] = '-l:libgomp.a -l:libgomp_nonshared.a'; } else { $short_name[] = '-lgomp'; }