Skip to content

Fix FFI on M1 macs #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix FFI on M1 macs #198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/FFI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,13 @@ private static function init(): void
EOS;
}

if (PHP_OS_FAMILY === "OSX" ||
PHP_OS_FAMILY === "Darwin") {
$glib_libname = $path . $glib_libname;
$gobject_libname = $path . $gobject_libname;
$vips_libname = $path . $vips_libname;
}
Comment on lines +735 to +740
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can probably omit this if statement and always prepend the fallback path to the library names.

Suggested change
if (PHP_OS_FAMILY === "OSX" ||
PHP_OS_FAMILY === "Darwin") {
$glib_libname = $path . $glib_libname;
$gobject_libname = $path . $gobject_libname;
$vips_libname = $path . $vips_libname;
}
# Ensure the fallback path is prepended to the lib names, if any
$glib_libname = $path . $glib_libname;
$gobject_libname = $path . $gobject_libname;
$vips_libname = $path . $vips_libname;


Utils::debugLog("init", ["binding ..."]);
self::$glib = \FFI::cdef($glib_decls, $glib_libname);
self::$gobject = \FFI::cdef($gobject_decls, $gobject_libname);
Expand Down