From 8a1ae4df1ca37a851f9936fcf2081536837e4c67 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 9 Aug 2024 09:09:19 +0100 Subject: [PATCH] fix(local-lisp-path): add Apple Silicon homebrew lisp-site --- build-emacs-for-macos | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/build-emacs-for-macos b/build-emacs-for-macos index 87e77a5..2354f5f 100755 --- a/build-emacs-for-macos +++ b/build-emacs-for-macos @@ -442,13 +442,18 @@ class Build '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib' ].compact.join(':') + local_lisp_path = [ + ENV.fetch('EMACS_LOCAL_LISP_PATH', '').split(':'), + '/Library/Application Support/Emacs/${version}/site-lisp', + '/Library/Application Support/Emacs/site-lisp', + '/usr/local/share/emacs/site-lisp', + '/opt/homebrew/share/emacs/site-lisp' + ].flatten.join(':') + configure_flags = [ '--with-ns', '--with-modules', - '--enable-locallisppath=' \ - '/Library/Application Support/Emacs/${version}/site-lisp:' \ - '/Library/Application Support/Emacs/site-lisp:' \ - '/usr/local/share/emacs/site-lisp' + "--enable-locallisppath=#{local_lisp_path}" ] if options[:xwidgets] && supports_xwidgets? configure_flags << '--with-xwidgets'