Fix building on M1 macOS

Automattic · Nov 11, 2021 · 1980805 · 1980805
1 parent a4b571b
commit 1980805
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -164,8 +164,11 @@
                 '-l<(jpeg_root)/lib/jpeg.lib',
               ]
             }, {
+              'include_dirs': [
+                '<!@(pkg-config libjpeg --cflags-only-I | sed s/-I//g)'
+              ],
               'libraries': [
-                '-ljpeg'
+                '<!@(pkg-config libjpeg --libs)'
               ]
             }]
           ]
@@ -180,7 +183,11 @@
                 '-l<(GTK_Root)/lib/gif.lib'
               ]
             }, {
+              'include_dirs': [
+                '/opt/homebrew/include'
+              ],
               'libraries': [
+                '-L/opt/homebrew/lib',
                 '-lgif'
               ]
             }]

diff --git a/util/has_lib.js b/util/has_lib.js
@@ -101,13 +101,14 @@ function hasPkgconfigLib (lib) {
 function main (query) {
   switch (query) {
     case 'gif':
-    case 'jpeg':
     case 'cairo':
       return hasSystemLib(query)
     case 'pango':
       return hasPkgconfigLib(query)
     case 'freetype':
       return hasFreetype()
+    case 'jpeg':
+      return hasPkgconfigLib('libjpeg')
     case 'rsvg':
       return hasPkgconfigLib('librsvg-2.0')
     default: