diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php
index 3f63c84b..6bb87782 100644
--- a/src/SPC/builder/Extension.php
+++ b/src/SPC/builder/Extension.php
@@ -387,8 +387,8 @@ class Extension
 
         // macOS ld64 doesn't understand these, while Linux and BSD do
         // use them to make sure that all symbols are picked up, even if a library has already been visited before
-        $preStatic = PHP_OS_FAMILY !== 'Darwin' ? '-Wl,-Bstatic -Wl,--start-group ' : '';
-        $postStatic = PHP_OS_FAMILY !== 'Darwin' ? ' -Wl,--end-group -Wl,-Bdynamic ' : ' ';
+        $preStatic = PHP_OS_FAMILY !== 'Darwin' ? '-Wl,--start-group ' : '';
+        $postStatic = PHP_OS_FAMILY !== 'Darwin' ? ' -Wl,--end-group ' : ' ';
         $env = [
             'CFLAGS' => $config['cflags'],
             'CXXFLAGS' => $config['cflags'],
diff --git a/src/SPC/builder/unix/library/ldap.php b/src/SPC/builder/unix/library/ldap.php
index 62f7bcd7..6c5eeae5 100644
--- a/src/SPC/builder/unix/library/ldap.php
+++ b/src/SPC/builder/unix/library/ldap.php
@@ -26,8 +26,11 @@ trait ldap
                 '--disable-slapd',
                 '--without-systemd',
                 '--without-cyrus-sasl',
+                '--without-cyrus-sasl',
+                'ac_cv_func_pthread_kill_other_threads_np=no'
             )
             ->appendEnv([
+                'CFLAGS' => '-Wno-date-time',
                 'LDFLAGS' => "-L{$this->getLibDir()}",
                 'CPPFLAGS' => "-I{$this->getIncludeDir()}",
             ])
diff --git a/src/SPC/builder/unix/library/liblz4.php b/src/SPC/builder/unix/library/liblz4.php
index 73108d95..b5970f74 100644
--- a/src/SPC/builder/unix/library/liblz4.php
+++ b/src/SPC/builder/unix/library/liblz4.php
@@ -19,7 +19,8 @@ trait liblz4
     {
         shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec("make PREFIX='' clean")
-            ->exec("make -j{$this->builder->concurrency} PREFIX=''")
+            ->exec("make lib -j{$this->builder->concurrency} PREFIX=''")
+            ->exec("sed -i 's/^\\$(MAKE) -C \\$(PRGDIR) \\$@/#\\$(MAKE) -C \\$(PRGDIR) \\$@/' Makefile")
             ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH);
 
         $this->patchPkgconfPrefix(['liblz4.pc']);
diff --git a/src/SPC/builder/unix/library/pkgconfig.php b/src/SPC/builder/unix/library/pkgconfig.php
index 05727f96..462e7344 100644
--- a/src/SPC/builder/unix/library/pkgconfig.php
+++ b/src/SPC/builder/unix/library/pkgconfig.php
@@ -13,7 +13,7 @@ trait pkgconfig
     {
         UnixAutoconfExecutor::create($this)
             ->appendEnv([
-                'CFLAGS' => PHP_OS_FAMILY !== 'Linux' ? '-Wimplicit-function-declaration -Wno-int-conversion' : '',
+                'CFLAGS' => '-Wimplicit-function-declaration -Wno-int-conversion',
                 'LDFLAGS' => !($this instanceof LinuxLibraryBase) || getenv('SPC_LIBC') === 'glibc' ? '' : '--static',
             ])
             ->configure(