@@ -93,19 +93,19 @@ public function config(array $extensions = [], array $libraries = [], bool $incl
93
93
return [
94
94
'cflags ' => trim (getenv ('CFLAGS ' ) . ' ' . $ cflags ),
95
95
'ldflags ' => trim (getenv ('LDFLAGS ' ) . ' ' . $ ldflags ),
96
- 'libs ' => trim (getenv ('LIBS ' ) . ' ' . $ libs ),
96
+ 'libs ' => trim (getenv ('LIBS ' ) . ' ' . $ libs ),
97
97
];
98
98
}
99
99
100
100
// embed
101
101
if (!$ this ->no_php ) {
102
102
$ libs = "-lphp -lc {$ libs }" ;
103
103
}
104
+ $ libs = '-L ' . BUILD_LIB_PATH . ' ' . $ libs ;
104
105
// mimalloc must come first
105
106
if (str_contains ($ libs , BUILD_LIB_PATH . '/mimalloc.o ' )) {
106
107
$ libs = BUILD_LIB_PATH . '/mimalloc.o ' . str_replace (BUILD_LIB_PATH . '/mimalloc.o ' , '' , $ libs );
107
108
}
108
- $ libs = '-L ' . BUILD_LIB_PATH . ' ' . $ libs ;
109
109
return [
110
110
'cflags ' => trim (getenv ('CFLAGS ' ) . ' ' . $ cflags ),
111
111
'ldflags ' => trim (getenv ('LDFLAGS ' ) . ' ' . $ ldflags ),
@@ -180,13 +180,13 @@ private function getLibsString(array $libraries, bool $use_short_libs = true): s
180
180
}
181
181
$ pkg_configs = implode (' ' , $ pkg_configs );
182
182
if ($ pkg_configs !== '' ) {
183
- $ pc_libs = PkgConfigUtil::getLibsArray ($ pkg_configs );
183
+ $ pc_libs = array_reverse ( PkgConfigUtil::getLibsArray ($ pkg_configs) );
184
184
$ lib_names = [...$ lib_names , ...$ pc_libs ];
185
185
}
186
186
}
187
187
188
188
// post-process
189
- $ lib_names = array_reverse ( array_unique (array_reverse ($ lib_names )));
189
+ $ lib_names = array_unique (array_reverse (array_filter ( $ lib_names, fn ( $ x ) => $ x !== '' )));
190
190
$ frameworks = array_unique ($ frameworks );
191
191
192
192
// process frameworks to short_name
0 commit comments