diff --git a/config/env.ini b/config/env.ini
index 718e556f..c77f6bcd 100644
--- a/config/env.ini
+++ b/config/env.ini
@@ -83,7 +83,7 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime
 ; - gnu-native: used for general linux distros, can build gnu target for the installed glibc version only.
 
 ; option to specify the target, superceded by SPC_TARGET if set
-SPC_LIBC=musl
+; SPC_LIBC=musl
 ; uncomment to link libc dynamically on musl
 ; SPC_MUSL_DYNAMIC=true
 
@@ -94,13 +94,13 @@ SPC_LIBC=musl
 ; `native-native`               - links against system libc dynamically
 ; `native-native-musl`          - links against musl libc statically
 ; `native-native-musl -dynamic` - links against musl libc dynamically
-; SPC_TARGET=
+SPC_TARGET=native-native-musl
 
-; compiler environments
-CC=${SPC_LINUX_DEFAULT_CC}
-CXX=${SPC_LINUX_DEFAULT_CXX}
-AR=${SPC_LINUX_DEFAULT_AR}
-LD=${SPC_LINUX_DEFAULT_LD}
+; compiler environments (default value is defined by selected toolchain)
+CC=${SPC_DEFAULT_CC}
+CXX=${SPC_DEFAULT_CXX}
+AR=${SPC_DEFAULT_AR}
+LD=${SPC_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_C_FLAGS="-fPIC -Os"
 SPC_DEFAULT_CXX_FLAGS="-fPIC -Os"
@@ -132,11 +132,11 @@ OPENSSLDIR=""
 ; build target: macho or macho (possibly we could support macho-universal in the future)
 ; Currently we do not support universal and cross-compilation for macOS.
 SPC_TARGET=native-macos
-; compiler environments
-CC=clang
-CXX=clang++
-AR=ar
-LD=ld
+; compiler environments (default value is defined by selected toolchain)
+CC=${SPC_DEFAULT_CC}
+CXX=${SPC_DEFAULT_CXX}
+AR=${SPC_DEFAULT_AR}
+LD=${SPC_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
 SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
diff --git a/config/pkg.ext.json b/config/pkg.ext.json
index b1e819eb..d1ca0b3f 100644
--- a/config/pkg.ext.json
+++ b/config/pkg.ext.json
@@ -1,5 +1,6 @@
 {
     "ext-amqp": {
+        "type": "php-extension",
         "artifact": "amqp",
         "depends": [
             "librabbitmq"
@@ -16,29 +17,29 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-apcu": {
+        "type": "php-extension",
         "artifact": "apcu",
         "license": {
             "type": "file",
             "path": "LICENSE"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-ast": {
+        "type": "php-extension",
         "artifact": "ast",
         "license": {
             "type": "file",
             "path": "LICENSE"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-bcmath": {
         "type": "php-extension"
     },
     "ext-brotli": {
+        "type": "php-extension",
         "artifact": "ext-brotli",
         "depends": [
             "brotli"
@@ -49,18 +50,17 @@
         },
         "php-extension": {
             "arg-type": "enable"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-bz2": {
+        "type": "php-extension",
         "depends": [
             "bzip2"
         ],
         "php-extension": {
             "arg-type@windows": "with",
             "arg-type": "with-path"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-calendar": {
         "type": "php-extension"
@@ -69,6 +69,7 @@
         "type": "php-extension"
     },
     "ext-curl": {
+        "type": "php-extension",
         "depends": [
             "curl"
         ],
@@ -79,19 +80,19 @@
         "php-extension": {
             "arg-type": "with",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-dba": {
-        "php-extension": {
-            "arg-type": "custom"
-        },
+        "type": "php-extension",
         "suggests": [
             "qdbm"
         ],
-        "type": "php-extension"
+        "php-extension": {
+            "arg-type": "custom"
+        }
     },
     "ext-dio": {
+        "type": "php-extension",
         "artifact": "dio",
         "license": {
             "type": "file",
@@ -101,10 +102,10 @@
             "support": {
                 "BSD": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-dom": {
+        "type": "php-extension",
         "depends": [
             "libxml2",
             "zlib"
@@ -118,18 +119,18 @@
             },
             "arg-type": "custom",
             "arg-type@windows": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-ds": {
+        "type": "php-extension",
         "artifact": "ext-ds",
         "license": {
             "type": "file",
             "path": "LICENSE"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-enchant": {
+        "type": "php-extension",
         "php-extension": {
             "support": {
                 "Windows": "wip",
@@ -137,10 +138,10 @@
                 "Darwin": "wip",
                 "Linux": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-ev": {
+        "type": "php-extension",
         "artifact": "ev",
         "depends": [
             "ext-sockets"
@@ -151,15 +152,18 @@
         },
         "php-extension": {
             "arg-type@windows": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-event": {
+        "type": "php-extension",
         "artifact": "ext-event",
         "depends": [
             "libevent",
             "ext-openssl"
         ],
+        "suggests": [
+            "ext-sockets"
+        ],
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -171,16 +175,13 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "suggests": [
-            "ext-sockets"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-exif": {
         "type": "php-extension"
     },
     "ext-ffi": {
+        "type": "php-extension",
         "depends": [
             "libffi"
         ],
@@ -194,8 +195,7 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-fileinfo": {
         "type": "php-extension"
@@ -204,17 +204,24 @@
         "type": "php-extension"
     },
     "ext-ftp": {
+        "type": "php-extension",
         "suggests": [
             "openssl"
-        ],
-        "type": "php-extension"
+        ]
     },
     "ext-gd": {
+        "type": "php-extension",
         "depends": [
             "zlib",
             "libpng",
             "ext-zlib"
         ],
+        "suggests": [
+            "libavif",
+            "libwebp",
+            "libjpeg",
+            "freetype"
+        ],
         "php-extension": {
             "support": {
                 "BSD": "wip"
@@ -222,16 +229,10 @@
             "arg-type": "custom",
             "arg-type@windows": "with",
             "notes": true
-        },
-        "suggests": [
-            "libavif",
-            "libwebp",
-            "libjpeg",
-            "freetype"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-gettext": {
+        "type": "php-extension",
         "depends": [
             "gettext"
         ],
@@ -241,10 +242,10 @@
                 "BSD": "wip"
             },
             "arg-type": "with-path"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-glfw": {
+        "type": "php-extension",
         "artifact": "ext-glfw",
         "depends": [
             "glfw"
@@ -262,10 +263,10 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-gmp": {
+        "type": "php-extension",
         "depends": [
             "gmp"
         ],
@@ -275,10 +276,10 @@
                 "BSD": "wip"
             },
             "arg-type": "with-path"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-gmssl": {
+        "type": "php-extension",
         "artifact": "ext-gmssl",
         "depends": [
             "gmssl"
@@ -291,10 +292,10 @@
             "support": {
                 "BSD": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-grpc": {
+        "type": "php-extension",
         "artifact": "grpc",
         "depends": [
             "grpc"
@@ -310,10 +311,10 @@
                 "BSD": "wip"
             },
             "arg-type": "enable-path"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-iconv": {
+        "type": "php-extension",
         "depends": [
             "libiconv"
         ],
@@ -326,11 +327,15 @@
             },
             "arg-type": "with-path",
             "arg-type@windows": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-igbinary": {
+        "type": "php-extension",
         "artifact": "igbinary",
+        "suggests": [
+            "ext-session",
+            "ext-apcu"
+        ],
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -339,14 +344,10 @@
             "support": {
                 "BSD": "wip"
             }
-        },
-        "suggests": [
-            "ext-session",
-            "ext-apcu"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-imagick": {
+        "type": "php-extension",
         "artifact": "ext-imagick",
         "depends": [
             "imagemagick"
@@ -362,14 +363,17 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-imap": {
+        "type": "php-extension",
         "artifact": "ext-imap",
         "depends": [
             "imap"
         ],
+        "suggests": [
+            "ext-openssl"
+        ],
         "license": {
             "type": "file",
             "path": [
@@ -383,13 +387,10 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "suggests": [
-            "ext-openssl"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-inotify": {
+        "type": "php-extension",
         "artifact": "inotify",
         "license": {
             "type": "file",
@@ -401,10 +402,10 @@
                 "BSD": "wip",
                 "Darwin": "no"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-intl": {
+        "type": "php-extension",
         "depends": [
             "icu"
         ],
@@ -415,28 +416,28 @@
             "support": {
                 "BSD": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-ldap": {
+        "type": "php-extension",
         "depends": [
             "ldap"
         ],
+        "suggests": [
+            "gmp",
+            "libsodium",
+            "ext-openssl"
+        ],
         "php-extension": {
             "support": {
                 "Windows": "wip",
                 "BSD": "wip"
             },
             "arg-type": "with-path"
-        },
-        "suggests": [
-            "gmp",
-            "libsodium",
-            "ext-openssl"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-libxml": {
+        "type": "php-extension",
         "depends": [
             "ext-xml"
         ],
@@ -448,10 +449,10 @@
             "build-shared": false,
             "build-static": true,
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-lz4": {
+        "type": "php-extension",
         "artifact": "ext-lz4",
         "depends": [
             "liblz4"
@@ -468,10 +469,10 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-mbregex": {
+        "type": "php-extension",
         "depends": [
             "onig",
             "ext-mbstring"
@@ -480,16 +481,16 @@
             "arg-type": "custom",
             "build-shared": false,
             "build-static": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-mbstring": {
+        "type": "php-extension",
         "php-extension": {
             "arg-type": "custom"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-mcrypt": {
+        "type": "php-extension",
         "php-extension": {
             "support": {
                 "Windows": "no",
@@ -498,10 +499,10 @@
                 "Linux": "no"
             },
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-memcache": {
+        "type": "php-extension",
         "artifact": "ext-memcache",
         "depends": [
             "ext-zlib",
@@ -518,10 +519,10 @@
             },
             "arg-type": "custom",
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-memcached": {
+        "type": "php-extension",
         "artifact": "memcached",
         "depends": [
             "libmemcached",
@@ -529,6 +530,12 @@
             "ext-session",
             "ext-zlib"
         ],
+        "suggests": [
+            "zstd",
+            "ext-igbinary",
+            "ext-msgpack",
+            "ext-session"
+        ],
         "lang": "cpp",
         "license": {
             "type": "file",
@@ -540,17 +547,17 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "suggests": [
-            "zstd",
-            "ext-igbinary",
-            "ext-msgpack",
-            "ext-session"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-mongodb": {
+        "type": "php-extension",
         "artifact": "mongodb",
+        "suggests": [
+            "icu",
+            "openssl",
+            "zstd",
+            "zlib"
+        ],
         "frameworks": [
             "CoreFoundation",
             "Security"
@@ -565,16 +572,10 @@
                 "Windows": "wip"
             },
             "arg-type": "custom"
-        },
-        "suggests": [
-            "icu",
-            "openssl",
-            "zstd",
-            "zlib"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-msgpack": {
+        "type": "php-extension",
         "artifact": "msgpack",
         "depends": [
             "ext-session"
@@ -589,30 +590,30 @@
             },
             "arg-type@windows": "enable",
             "arg-type": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-mysqli": {
+        "type": "php-extension",
         "depends": [
             "ext-mysqlnd"
         ],
         "php-extension": {
             "arg-type": "with",
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-mysqlnd": {
+        "type": "php-extension",
         "depends": [
             "zlib"
         ],
         "php-extension": {
             "arg-type@windows": "with",
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-oci8": {
+        "type": "php-extension",
         "php-extension": {
             "support": {
                 "Windows": "wip",
@@ -621,10 +622,10 @@
                 "Linux": "no"
             },
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-odbc": {
+        "type": "php-extension",
         "depends": [
             "unixodbc"
         ],
@@ -634,18 +635,18 @@
                 "Windows": "wip"
             },
             "arg-type": "custom"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-opcache": {
+        "type": "php-extension",
         "php-extension": {
             "arg-type@windows": "enable",
             "arg-type": "custom",
             "zend-extension": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-openssl": {
+        "type": "php-extension",
         "depends": [
             "openssl",
             "zlib",
@@ -656,10 +657,10 @@
             "arg-type@windows": "with",
             "build-with-php": true,
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-opentelemetry": {
+        "type": "php-extension",
         "artifact": "opentelemetry",
         "license": {
             "type": "file",
@@ -669,10 +670,10 @@
             "support": {
                 "BSD": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-parallel": {
+        "type": "php-extension",
         "artifact": "parallel",
         "depends@windows": [
             "pthreads4w"
@@ -687,10 +688,10 @@
             },
             "arg-type@windows": "with",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-password-argon2": {
+        "type": "php-extension",
         "depends": [
             "libargon2",
             "openssl"
@@ -702,31 +703,31 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-pcntl": {
+        "type": "php-extension",
         "php-extension": {
             "support": {
                 "Windows": "no"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-pdo": {
         "type": "php-extension"
     },
     "ext-pdo_mysql": {
+        "type": "php-extension",
         "depends": [
             "ext-pdo",
             "ext-mysqlnd"
         ],
         "php-extension": {
             "arg-type": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-pdo_odbc": {
+        "type": "php-extension",
         "depends": [
             "unixodbc",
             "ext-pdo",
@@ -737,10 +738,10 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-pdo_pgsql": {
+        "type": "php-extension",
         "depends": [
             "postgresql",
             "ext-pdo",
@@ -755,10 +756,10 @@
             },
             "arg-type": "with-path",
             "arg-type@windows": "custom"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-pdo_sqlite": {
+        "type": "php-extension",
         "depends": [
             "sqlite",
             "ext-pdo",
@@ -769,10 +770,10 @@
                 "BSD": "wip"
             },
             "arg-type": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-pdo_sqlsrv": {
+        "type": "php-extension",
         "artifact": "pdo_sqlsrv",
         "depends": [
             "ext-pdo",
@@ -787,10 +788,10 @@
                 "BSD": "wip"
             },
             "arg-type": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-pgsql": {
+        "type": "php-extension",
         "depends": [
             "postgresql"
         ],
@@ -803,24 +804,24 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-phar": {
+        "type": "php-extension",
         "depends": [
             "ext-zlib"
-        ],
-        "type": "php-extension"
+        ]
     },
     "ext-posix": {
+        "type": "php-extension",
         "php-extension": {
             "support": {
                 "Windows": "no"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-protobuf": {
+        "type": "php-extension",
         "artifact": "protobuf",
         "license": {
             "type": "file",
@@ -831,10 +832,10 @@
                 "Windows": "wip",
                 "BSD": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-rar": {
+        "type": "php-extension",
         "artifact": "rar",
         "lang": "cpp",
         "license": {
@@ -847,10 +848,10 @@
                 "Darwin": "partial"
             },
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-rdkafka": {
+        "type": "php-extension",
         "artifact": "ext-rdkafka",
         "depends": [
             "librdkafka"
@@ -866,10 +867,10 @@
                 "Windows": "wip"
             },
             "arg-type": "custom"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-readline": {
+        "type": "php-extension",
         "depends": [
             "libedit"
         ],
@@ -881,11 +882,18 @@
             "arg-type": "with-path",
             "build-shared": false,
             "build-static": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-redis": {
+        "type": "php-extension",
         "artifact": "redis",
+        "suggests": [
+            "zstd",
+            "liblz4",
+            "ext-session",
+            "ext-igbinary",
+            "ext-msgpack"
+        ],
         "license": {
             "type": "file",
             "path": [
@@ -898,38 +906,31 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "suggests": [
-            "zstd",
-            "liblz4",
-            "ext-session",
-            "ext-igbinary",
-            "ext-msgpack"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-session": {
+        "type": "php-extension",
         "php-extension": {
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-shmop": {
+        "type": "php-extension",
         "php-extension": {
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-simdjson": {
+        "type": "php-extension",
         "artifact": "ext-simdjson",
         "lang": "cpp",
         "license": {
             "type": "file",
             "path": "LICENSE"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-simplexml": {
+        "type": "php-extension",
         "depends": [
             "libxml2"
         ],
@@ -942,14 +943,17 @@
             },
             "arg-type": "custom",
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-snappy": {
+        "type": "php-extension",
         "artifact": "ext-snappy",
         "depends": [
             "snappy"
         ],
+        "suggests": [
+            "ext-apcu"
+        ],
         "lang": "cpp",
         "license": {
             "type": "file",
@@ -961,13 +965,10 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "suggests": [
-            "ext-apcu"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-snmp": {
+        "type": "php-extension",
         "depends": [
             "net-snmp"
         ],
@@ -978,10 +979,10 @@
             },
             "arg-type@windows": "with",
             "arg-type": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-soap": {
+        "type": "php-extension",
         "depends": [
             "ext-libxml",
             "ext-session"
@@ -991,13 +992,13 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-sockets": {
         "type": "php-extension"
     },
     "ext-sodium": {
+        "type": "php-extension",
         "depends": [
             "libsodium"
         ],
@@ -1006,10 +1007,10 @@
                 "BSD": "wip"
             },
             "arg-type": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-spx": {
+        "type": "php-extension",
         "artifact": "spx",
         "depends": [
             "zlib"
@@ -1025,10 +1026,10 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-sqlite3": {
+        "type": "php-extension",
         "depends": [
             "sqlite"
         ],
@@ -1039,10 +1040,10 @@
             "arg-type": "with-path",
             "arg-type@windows": "with",
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-sqlsrv": {
+        "type": "php-extension",
         "artifact": "sqlsrv",
         "depends": [
             "unixodbc"
@@ -1059,10 +1060,10 @@
             "support": {
                 "BSD": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-ssh2": {
+        "type": "php-extension",
         "artifact": "ext-ssh2",
         "depends": [
             "libssh2",
@@ -1079,10 +1080,10 @@
             },
             "arg-type": "with-path",
             "arg-type@windows": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-swoole": {
+        "type": "php-extension",
         "artifact": "swoole",
         "depends": [
             "libcares",
@@ -1092,6 +1093,18 @@
             "ext-openssl",
             "ext-curl"
         ],
+        "suggests": [
+            "zstd",
+            "ext-sockets",
+            "ext-swoole-hook-pgsql",
+            "ext-swoole-hook-mysql",
+            "ext-swoole-hook-sqlite",
+            "ext-swoole-hook-odbc"
+        ],
+        "suggests@linux": [
+            "zstd",
+            "liburing"
+        ],
         "lang": "cpp",
         "license": {
             "type": "file",
@@ -1104,28 +1117,19 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "suggests": [
-            "zstd",
-            "ext-sockets",
-            "ext-swoole-hook-pgsql",
-            "ext-swoole-hook-mysql",
-            "ext-swoole-hook-sqlite",
-            "ext-swoole-hook-odbc"
-        ],
-        "suggests@linux": [
-            "zstd",
-            "liburing"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-swoole-hook-mysql": {
+        "type": "php-extension",
         "depends": [
             "ext-mysqlnd",
             "ext-pdo",
             "ext-pdo_mysql",
             "ext-swoole"
         ],
+        "suggests": [
+            "ext-mysqli"
+        ],
         "php-extension": {
             "support": {
                 "Windows": "no",
@@ -1133,13 +1137,10 @@
             },
             "arg-type": "none",
             "notes": true
-        },
-        "suggests": [
-            "ext-mysqli"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-swoole-hook-odbc": {
+        "type": "php-extension",
         "depends": [
             "unixodbc",
             "ext-pdo",
@@ -1152,10 +1153,10 @@
             },
             "arg-type": "none",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-swoole-hook-pgsql": {
+        "type": "php-extension",
         "depends": [
             "ext-pgsql",
             "ext-pdo",
@@ -1169,10 +1170,10 @@
             },
             "arg-type": "none",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-swoole-hook-sqlite": {
+        "type": "php-extension",
         "depends": [
             "ext-sqlite3",
             "ext-pdo",
@@ -1185,11 +1186,17 @@
             },
             "arg-type": "none",
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-swow": {
+        "type": "php-extension",
         "artifact": "swow",
+        "suggests": [
+            "openssl",
+            "curl",
+            "ext-openssl",
+            "ext-curl"
+        ],
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1200,42 +1207,36 @@
             },
             "arg-type": "custom",
             "notes": true
-        },
-        "suggests": [
-            "openssl",
-            "curl",
-            "ext-openssl",
-            "ext-curl"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-sysvmsg": {
+        "type": "php-extension",
         "php-extension": {
             "support": {
                 "Windows": "no",
                 "BSD": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-sysvsem": {
+        "type": "php-extension",
         "php-extension": {
             "support": {
                 "Windows": "no",
                 "BSD": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-sysvshm": {
+        "type": "php-extension",
         "php-extension": {
             "support": {
                 "BSD": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-tidy": {
+        "type": "php-extension",
         "depends": [
             "tidy"
         ],
@@ -1245,16 +1246,16 @@
                 "BSD": "wip"
             },
             "arg-type": "with-path"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-tokenizer": {
+        "type": "php-extension",
         "php-extension": {
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-trader": {
+        "type": "php-extension",
         "artifact": "ext-trader",
         "license": {
             "type": "file",
@@ -1265,10 +1266,10 @@
                 "BSD": "wip",
                 "Windows": "wip"
             }
-        },
-        "type": "php-extension"
+        }
     },
     "ext-uuid": {
+        "type": "php-extension",
         "artifact": "ext-uuid",
         "depends": [
             "libuuid"
@@ -1283,10 +1284,10 @@
                 "BSD": "wip"
             },
             "arg-type": "with-path"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-uv": {
+        "type": "php-extension",
         "artifact": "ext-uv",
         "depends": [
             "libuv",
@@ -1302,10 +1303,10 @@
                 "BSD": "wip"
             },
             "arg-type": "with-path"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-xdebug": {
+        "type": "php-extension",
         "artifact": "xdebug",
         "license": {
             "type": "file",
@@ -1322,10 +1323,10 @@
             "build-static": false,
             "notes": true,
             "zend-extension": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-xhprof": {
+        "type": "php-extension",
         "artifact": "xhprof",
         "depends": [
             "ext-ctype"
@@ -1341,15 +1342,18 @@
             },
             "build-with-php": true,
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-xlswriter": {
+        "type": "php-extension",
         "artifact": "xlswriter",
         "depends": [
             "ext-zlib",
             "ext-zip"
         ],
+        "suggests": [
+            "openssl"
+        ],
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1359,13 +1363,10 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "suggests": [
-            "openssl"
-        ],
-        "type": "php-extension"
+        }
     },
     "ext-xml": {
+        "type": "php-extension",
         "depends": [
             "libxml2"
         ],
@@ -1380,10 +1381,10 @@
             "arg-type@windows": "with",
             "build-with-php": true,
             "notes": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-xmlreader": {
+        "type": "php-extension",
         "depends": [
             "libxml2"
         ],
@@ -1397,10 +1398,10 @@
             },
             "arg-type": "custom",
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-xmlwriter": {
+        "type": "php-extension",
         "depends": [
             "libxml2"
         ],
@@ -1413,10 +1414,10 @@
             },
             "arg-type": "custom",
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-xsl": {
+        "type": "php-extension",
         "depends": [
             "libxslt",
             "ext-xml",
@@ -1428,10 +1429,10 @@
                 "BSD": "wip"
             },
             "arg-type": "with-path"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-xz": {
+        "type": "php-extension",
         "artifact": "ext-xz",
         "depends": [
             "xz"
@@ -1442,10 +1443,10 @@
         },
         "php-extension": {
             "arg-type": "with"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-yac": {
+        "type": "php-extension",
         "artifact": "yac",
         "depends": [
             "fastlz",
@@ -1460,10 +1461,10 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-yaml": {
+        "type": "php-extension",
         "artifact": "yaml",
         "depends": [
             "libyaml"
@@ -1478,10 +1479,10 @@
             },
             "arg-type@windows": "with",
             "arg-type": "with-path"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-zip": {
+        "type": "php-extension",
         "artifact": "ext-zip",
         "depends": [
             "libzip"
@@ -1504,10 +1505,10 @@
             },
             "arg-type": "custom",
             "arg-type@windows": "enable"
-        },
-        "type": "php-extension"
+        }
     },
     "ext-zlib": {
+        "type": "php-extension",
         "depends": [
             "zlib"
         ],
@@ -1517,10 +1518,10 @@
             "build-shared": false,
             "build-static": true,
             "build-with-php": true
-        },
-        "type": "php-extension"
+        }
     },
     "ext-zstd": {
+        "type": "php-extension",
         "artifact": "ext-zstd",
         "depends": [
             "zstd"
@@ -1535,7 +1536,6 @@
                 "BSD": "wip"
             },
             "arg-type": "custom"
-        },
-        "type": "php-extension"
+        }
     }
 }
diff --git a/config/pkg.target.json b/config/pkg.target.json
index 8e04df90..a5c20b78 100644
--- a/config/pkg.target.json
+++ b/config/pkg.target.json
@@ -1,5 +1,6 @@
 {
     "frankenphp": {
+        "type": "virtual-target",
         "artifact": "frankenphp",
         "depends": [
             "php-embed",
@@ -9,90 +10,78 @@
             "php-embed",
             "go-xcaddy",
             "libxml2"
-        ],
-        "type": "virtual-target"
+        ]
     },
     "go-xcaddy": {
+        "type": "target",
         "artifact": "go-xcaddy",
         "static-bins": [
             "xcaddy"
-        ],
-        "type": "target"
+        ]
     },
     "musl-toolchain": {
-        "artifact": "musl-toolchain",
-        "type": "target"
+        "type": "target",
+        "artifact": "musl-toolchain"
     },
     "nasm": {
-        "artifact": "nasm",
-        "type": "target"
+        "type": "target",
+        "artifact": "nasm"
     },
     "php": {
+        "type": "target",
         "artifact": "php-src",
         "depends@macos": [
             "libxml2"
-        ],
-        "type": "target"
+        ]
     },
     "php-cgi": {
+        "type": "virtual-target",
         "depends": [
             "php"
-        ],
-        "type": "virtual-target"
+        ]
     },
     "php-cli": {
+        "type": "virtual-target",
         "depends": [
             "php"
-        ],
-        "type": "virtual-target"
+        ]
     },
     "php-embed": {
+        "type": "virtual-target",
         "depends": [
             "php"
-        ],
-        "type": "virtual-target"
+        ]
     },
     "php-fpm": {
+        "type": "virtual-target",
         "depends": [
             "php"
-        ],
-        "type": "virtual-target"
+        ]
     },
     "php-micro": {
+        "type": "virtual-target",
         "artifact": "micro",
         "depends": [
             "php"
-        ],
-        "type": "virtual-target"
+        ]
     },
     "php-sdk-binary-tools": {
-        "artifact": "php-sdk-binary-tools",
-        "type": "target"
-    },
-    "pkg-config": {
-        "artifact": "pkg-config",
-        "static-bins": [
-            "pkg-config"
-        ],
-        "type": "target"
+        "type": "target",
+        "artifact": "php-sdk-binary-tools"
     },
     "strawberry-perl": {
-        "artifact": "strawberry-perl",
-        "type": "target"
+        "type": "target",
+        "artifact": "strawberry-perl"
     },
     "upx": {
-        "artifact": "upx",
-        "type": "target"
+        "type": "target",
+        "artifact": "upx"
     },
     "vswhere": {
+        "type": "target",
         "artifact": "vswhere",
         "static-bins@windows": [
             "vswhere.exe"
-        ],
-        "type": "target"
-    },
-    "zig": {
-        "artifact": "zig",
-        "type": "target"
+        ]
     }
 }
diff --git a/config/pkg/lib/curl.yml b/config/pkg/lib/curl.yml
index 38d632ce..f183b21e 100644
--- a/config/pkg/lib/curl.yml
+++ b/config/pkg/lib/curl.yml
@@ -4,15 +4,11 @@ curl:
     source:
       type: ghrel
       repo: curl/curl
-      match: 'curl.+\.tar\.xz'
+      match: curl.+\.tar\.xz
       prefer-stable: true
     metadata:
       license-files: [COPYING]
       license: curl
-  static-libs@unix:
-    - libcurl.a
-  headers:
-    - curl
   depends@unix:
     - openssl
     - zlib
@@ -31,3 +27,7 @@ curl:
     - CoreFoundation
     - CoreServices
     - SystemConfiguration
+  headers:
+    - curl
+  static-libs@unix:
+    - libcurl.a
diff --git a/config/pkg/lib/gettext.yml b/config/pkg/lib/gettext.yml
index 5b1f57a6..58f541f8 100644
--- a/config/pkg/lib/gettext.yml
+++ b/config/pkg/lib/gettext.yml
@@ -10,10 +10,10 @@ gettext:
       license: LGPL-2.1-or-later
   depends:
     - libiconv
+  suggests:
+    - ncurses
+    - libxml2
   frameworks:
     - CoreFoundation
   static-libs@unix:
     - libintl.a
-  suggests:
-    - ncurses
-    - libxml2
diff --git a/config/pkg/lib/idn2.yml b/config/pkg/lib/idn2.yml
index 5d2e2043..cef2a149 100644
--- a/config/pkg/lib/idn2.yml
+++ b/config/pkg/lib/idn2.yml
@@ -11,11 +11,11 @@ idn2:
   depends@macos:
     - libiconv
     - gettext
-  headers:
-    - idn2.h
-  pkg-configs:
-    - libidn2
   suggests@unix:
     - libiconv
     - gettext
     - libunistring
+  headers:
+    - idn2.h
+  pkg-configs:
+    - libidn2
diff --git a/config/pkg/lib/krb5.yml b/config/pkg/lib/krb5.yml
index 305a95a1..07fa3327 100644
--- a/config/pkg/lib/krb5.yml
+++ b/config/pkg/lib/krb5.yml
@@ -11,6 +11,9 @@ krb5:
       source-root: src
   depends:
     - openssl
+  suggests:
+    - ldap
+    - libedit
   frameworks:
     - Kerberos
   headers:
@@ -18,6 +21,3 @@ krb5:
     - gssapi/gssapi.h
   pkg-configs:
     - krb5-gssapi
-  suggests:
-    - ldap
-    - libedit
diff --git a/config/pkg/lib/libxml2.yml b/config/pkg/lib/libxml2.yml
index 8ba0f8e1..db88e8b1 100644
--- a/config/pkg/lib/libxml2.yml
+++ b/config/pkg/lib/libxml2.yml
@@ -10,10 +10,10 @@ libxml2:
       license: MIT
   depends@unix:
     - libiconv
+  suggests@unix:
+    - xz
+    - zlib
   headers:
     - libxml2
   pkg-configs:
     - libxml-2.0
-  suggests@unix:
-    - xz
-    - zlib
diff --git a/config/pkg/lib/nghttp2.yml b/config/pkg/lib/nghttp2.yml
index 20a1840d..166c33ac 100644
--- a/config/pkg/lib/nghttp2.yml
+++ b/config/pkg/lib/nghttp2.yml
@@ -11,14 +11,14 @@ nghttp2:
   depends:
     - zlib
     - openssl
+  suggests:
+    - libxml2
+    - nghttp3
+    - ngtcp2
+    - brotli
   headers:
     - nghttp2
   pkg-configs:
     - libnghttp2
   static-libs@unix:
     - libnghttp2.a
-  suggests:
-    - libxml2
-    - nghttp3
-    - ngtcp2
-    - brotli
diff --git a/config/pkg/lib/ngtcp2.yml b/config/pkg/lib/ngtcp2.yml
index a609d3ca..c864739a 100644
--- a/config/pkg/lib/ngtcp2.yml
+++ b/config/pkg/lib/ngtcp2.yml
@@ -11,6 +11,9 @@ ngtcp2:
       license: MIT
   depends:
     - openssl
+  suggests:
+    - nghttp3
+    - brotli
   headers:
     - ngtcp2
   pkg-configs:
@@ -19,6 +22,3 @@ ngtcp2:
   static-libs@unix:
     - libngtcp2.a
     - libngtcp2_crypto_ossl.a
-  suggests:
-    - nghttp3
-    - brotli
diff --git a/config/pkg/target/pkg-config.yml b/config/pkg/target/pkg-config.yml
new file mode 100644
index 00000000..9b6d1603
--- /dev/null
+++ b/config/pkg/target/pkg-config.yml
@@ -0,0 +1,9 @@
+pkg-config:
+  type: target
+  artifact:
+    source: 'https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz'
+    binary:
+      linux-x86_64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-x86_64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
+      linux-aarch64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-aarch64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
+      macos-x86_64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-x86_64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
+      macos-aarch64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-aarch64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
diff --git a/config/pkg/target/zig.yml b/config/pkg/target/zig.yml
new file mode 100644
index 00000000..dda72b55
--- /dev/null
+++ b/config/pkg/target/zig.yml
@@ -0,0 +1,4 @@
+zig:
+  type: target
+  artifact:
+    binary: custom
diff --git a/spc.registry.json b/spc.registry.json
index e8be4b5d..b3d34939 100644
--- a/spc.registry.json
+++ b/spc.registry.json
@@ -13,6 +13,7 @@
         "config": [
             "config/pkg.ext.json",
             "config/pkg/lib",
+            "config/pkg/target",
             "config/pkg.target.json"
         ]
     },
diff --git a/src/StaticPHP/Command/Dev/LintConfigCommand.php b/src/StaticPHP/Command/Dev/LintConfigCommand.php
index 1b08bb85..8149af14 100644
--- a/src/StaticPHP/Command/Dev/LintConfigCommand.php
+++ b/src/StaticPHP/Command/Dev/LintConfigCommand.php
@@ -56,7 +56,7 @@ class LintConfigCommand extends BaseCommand
     public function packageSortKey(string $a, string $b): int
     {
         // sort by predefined order, other not matching keys go to the end alphabetically
-        $order = ['type', 'artifact'];
+        $order = ['type', 'artifact', 'depends', 'suggests', 'frameworks'];
 
         // Handle suffix patterns (e.g., 'depends@unix', 'static-libs@windows')
         $base_a = preg_replace('/@(unix|windows|macos|linux|freebsd|bsd)$/', '', $a);
diff --git a/src/StaticPHP/Doctor/Item/LinuxMuslCheck.php b/src/StaticPHP/Doctor/Item/LinuxMuslCheck.php
index 4d7a86be..b64df85b 100644
--- a/src/StaticPHP/Doctor/Item/LinuxMuslCheck.php
+++ b/src/StaticPHP/Doctor/Item/LinuxMuslCheck.php
@@ -27,25 +27,25 @@ class LinuxMuslCheck
     public static function optionalCheck(): bool
     {
         $toolchain = ApplicationContext::get(ToolchainInterface::class);
-        return $toolchain instanceof MuslToolchain || $toolchain instanceof ZigToolchain && !LinuxUtil::isMuslDist();
+        return $toolchain instanceof MuslToolchain || $toolchain instanceof ZigToolchain && !LinuxUtil::isMuslDist() && !str_contains(getenv('SPC_TARGET') ?: '', 'gnu');
     }
 
     /** @noinspection PhpUnused */
     #[CheckItem('if musl-wrapper is installed', limit_os: 'Linux', level: 800)]
-    public function checkMusl(): CheckResult
+    public function checkMusl(): ?CheckResult
     {
         $musl_wrapper_lib = sprintf('/lib/ld-musl-%s.so.1', php_uname('m'));
         if (file_exists($musl_wrapper_lib) && (file_exists('/usr/local/musl/lib/libc.a') || getenv('SPC_TOOLCHAIN') === ZigToolchain::class)) {
-            return CheckResult::ok();
+            return null;
         }
         return CheckResult::fail('musl-wrapper is not installed on your system', 'fix-musl-wrapper');
     }
 
     #[CheckItem('if musl-cross-make is installed', limit_os: 'Linux', level: 799)]
-    public function checkMuslCrossMake(): CheckResult
+    public function checkMuslCrossMake(): ?CheckResult
     {
         if (getenv('SPC_TOOLCHAIN') === ZigToolchain::class && !LinuxUtil::isMuslDist()) {
-            return CheckResult::ok();
+            return null;
         }
         $arch = arch2gnu(php_uname('m'));
         $cross_compile_lib = "/usr/local/musl/{$arch}-linux-musl/lib/libc.a";
diff --git a/src/StaticPHP/Package/PackageInstaller.php b/src/StaticPHP/Package/PackageInstaller.php
index 9ceb2107..2469159a 100644
--- a/src/StaticPHP/Package/PackageInstaller.php
+++ b/src/StaticPHP/Package/PackageInstaller.php
@@ -259,7 +259,7 @@ class PackageInstaller
         if ($this->isBuildPackage($package)) {
             return $package->isInstalled();
         }
-        if ($package instanceof LibraryPackage && $package->getArtifact()->shouldUseBinary()) {
+        if ($package->getArtifact() !== null && $package->getArtifact()->shouldUseBinary()) {
             $artifact = $package->getArtifact();
             return $artifact->isBinaryExtracted();
         }
diff --git a/src/StaticPHP/Toolchain/ClangNativeToolchain.php b/src/StaticPHP/Toolchain/ClangNativeToolchain.php
index 2513dd71..27ae2b65 100644
--- a/src/StaticPHP/Toolchain/ClangNativeToolchain.php
+++ b/src/StaticPHP/Toolchain/ClangNativeToolchain.php
@@ -18,10 +18,10 @@ class ClangNativeToolchain implements UnixToolchainInterface
 {
     public function initEnv(): void
     {
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CC=clang');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=clang++');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=ar');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=ld');
+        GlobalEnvManager::putenv('SPC_DEFAULT_CC=clang');
+        GlobalEnvManager::putenv('SPC_DEFAULT_CXX=clang++');
+        GlobalEnvManager::putenv('SPC_DEFAULT_AR=ar');
+        GlobalEnvManager::putenv('SPC_DEFAULT_LD=ld');
     }
 
     public function afterInit(): void
diff --git a/src/StaticPHP/Toolchain/GccNativeToolchain.php b/src/StaticPHP/Toolchain/GccNativeToolchain.php
index dbf9925e..7c339e69 100644
--- a/src/StaticPHP/Toolchain/GccNativeToolchain.php
+++ b/src/StaticPHP/Toolchain/GccNativeToolchain.php
@@ -15,10 +15,10 @@ class GccNativeToolchain implements UnixToolchainInterface
 {
     public function initEnv(): void
     {
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CC=gcc');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=g++');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=ar');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=ld');
+        GlobalEnvManager::putenv('SPC_DEFAULT_CC=gcc');
+        GlobalEnvManager::putenv('SPC_DEFAULT_CXX=g++');
+        GlobalEnvManager::putenv('SPC_DEFAULT_AR=ar');
+        GlobalEnvManager::putenv('SPC_DEFAULT_LD=ld');
     }
 
     public function afterInit(): void
diff --git a/src/StaticPHP/Toolchain/MuslToolchain.php b/src/StaticPHP/Toolchain/MuslToolchain.php
index c7b39dbf..6963a364 100644
--- a/src/StaticPHP/Toolchain/MuslToolchain.php
+++ b/src/StaticPHP/Toolchain/MuslToolchain.php
@@ -14,10 +14,10 @@ class MuslToolchain implements UnixToolchainInterface
     {
         $arch = getenv('GNU_ARCH');
         // Set environment variables for musl toolchain
-        GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_CC={$arch}-linux-musl-gcc");
-        GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_CXX={$arch}-linux-musl-g++");
-        GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_AR={$arch}-linux-musl-ar");
-        GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_LD={$arch}-linux-musl-ld");
+        GlobalEnvManager::putenv("SPC_DEFAULT_CC={$arch}-linux-musl-gcc");
+        GlobalEnvManager::putenv("SPC_DEFAULT_CXX={$arch}-linux-musl-g++");
+        GlobalEnvManager::putenv("SPC_DEFAULT_AR={$arch}-linux-musl-ar");
+        GlobalEnvManager::putenv("SPC_DEFAULT_LD={$arch}-linux-musl-ld");
         GlobalEnvManager::addPathIfNotExists('/usr/local/musl/bin');
         GlobalEnvManager::addPathIfNotExists("/usr/local/musl/{$arch}-linux-musl/bin");
 
@@ -40,7 +40,7 @@ class MuslToolchain implements UnixToolchainInterface
 
     public function getCompilerInfo(): ?string
     {
-        $compiler = getenv('CC') ?: getenv('SPC_LINUX_DEFAULT_CC');
+        $compiler = getenv('CC') ?: getenv('SPC_DEFAULT_CC');
         $version = shell(false)->execWithResult("{$compiler} --version", false);
         $head = pathinfo($compiler, PATHINFO_BASENAME);
         if ($version[0] === 0 && preg_match('/linux-musl-cc.*(\d+.\d+.\d+)/', $version[1][0], $match)) {
diff --git a/src/StaticPHP/Util/PkgConfigUtil.php b/src/StaticPHP/Util/PkgConfigUtil.php
index 5efd33de..d5b03757 100644
--- a/src/StaticPHP/Util/PkgConfigUtil.php
+++ b/src/StaticPHP/Util/PkgConfigUtil.php
@@ -28,7 +28,12 @@ class PkgConfigUtil
         ];
         $found = null;
         foreach ($find_list as $file) {
-            if (file_exists($file) && is_executable($file)) {
+            $exists = file_exists($file);
+            $executable = is_executable($file);
+            if (!$exists) {
+                continue;
+            }
+            if (!$executable && chmod($file, 0755) || $executable) {
                 $found = $file;
                 break;
             }