mirror of
https://github.com/jimeh/build-emacs-for-macos.git
synced 2026-02-19 13:06:38 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
5a61a72a73
|
|||
| 9cdf67e71b | |||
|
946856e9c2
|
|||
|
|
2247158051
|
@@ -2,6 +2,14 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||||
|
|
||||||
|
### [0.4.3](https://github.com/jimeh/build-emacs-for-macos/compare/0.4.2...0.4.3) (2020-12-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **big-sur:** add Xcode CLI tools lib directory to runtime LIBRARY_PATH ([946856e](https://github.com/jimeh/build-emacs-for-macos/commit/946856e9c242d4a6fb5f839d8cae0acfafecdfc6))
|
||||||
|
* **big-sur:** added support for building on Big Sur ([2247158](https://github.com/jimeh/build-emacs-for-macos/commit/2247158051d0f59933569b6974b2b5269f13c79e))
|
||||||
|
|
||||||
### [0.4.2](https://github.com/jimeh/build-emacs-for-macos/compare/0.4.1...0.4.2) (2020-12-09)
|
### [0.4.2](https://github.com/jimeh/build-emacs-for-macos/compare/0.4.1...0.4.2) (2020-12-09)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -298,6 +298,11 @@ class Build
|
|||||||
"#{brew_dir}/opt/texinfo/bin",
|
"#{brew_dir}/opt/texinfo/bin",
|
||||||
ENV['PATH']
|
ENV['PATH']
|
||||||
].compact.join(':')
|
].compact.join(':')
|
||||||
|
|
||||||
|
ENV['LIBRARY_PATH'] = [
|
||||||
|
ENV['LIBRARY_PATH'],
|
||||||
|
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"
|
||||||
|
].compact.join(':')
|
||||||
|
|
||||||
configure_flags = [
|
configure_flags = [
|
||||||
'--with-ns',
|
'--with-ns',
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
|
|||||||
index 25e2de9..bcedd31 100644
|
index 25e2de9..bcedd31 100644
|
||||||
--- a/lisp/emacs-lisp/comp.el
|
--- a/lisp/emacs-lisp/comp.el
|
||||||
+++ b/lisp/emacs-lisp/comp.el
|
+++ b/lisp/emacs-lisp/comp.el
|
||||||
@@ -2801,6 +2801,53 @@ queued with LOAD %"
|
@@ -2801,6 +2801,57 @@ queued with LOAD %"
|
||||||
(comp-run-async-workers)
|
(comp-run-async-workers)
|
||||||
(message "Compilation started."))))
|
(message "Compilation started."))))
|
||||||
|
|
||||||
@@ -13,6 +13,8 @@ index 25e2de9..bcedd31 100644
|
|||||||
+ (string-match-p "\.app\/Contents\/MacOS\/?$"
|
+ (string-match-p "\.app\/Contents\/MacOS\/?$"
|
||||||
+ invocation-directory))
|
+ invocation-directory))
|
||||||
+ (let* ((library-path-env (getenv "LIBRARY_PATH"))
|
+ (let* ((library-path-env (getenv "LIBRARY_PATH"))
|
||||||
|
+ (devtools-dir
|
||||||
|
+ "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib")
|
||||||
+ (gcc-base-dir (concat invocation-directory "lib/gcc"))
|
+ (gcc-base-dir (concat invocation-directory "lib/gcc"))
|
||||||
+ (gcc-version (car (seq-filter
|
+ (gcc-version (car (seq-filter
|
||||||
+ (lambda (dir) (string-match-p "^[0-9]+$" dir))
|
+ (lambda (dir) (string-match-p "^[0-9]+$" dir))
|
||||||
@@ -28,6 +30,8 @@ index 25e2de9..bcedd31 100644
|
|||||||
+ (darwin-dir (concat darwin-base-dir "/" darwin-version))
|
+ (darwin-dir (concat darwin-base-dir "/" darwin-version))
|
||||||
+ (lib-paths (append
|
+ (lib-paths (append
|
||||||
+ (list gcc-dir darwin-dir)
|
+ (list gcc-dir darwin-dir)
|
||||||
|
+ (if (file-directory-p devtools-dir)
|
||||||
|
+ (list devtools-dir) (list))
|
||||||
+ (if library-path-env (list library-path-env) (list)))))
|
+ (if library-path-env (list library-path-env) (list)))))
|
||||||
+
|
+
|
||||||
+ (when (and gcc-dir darwin-dir)
|
+ (when (and gcc-dir darwin-dir)
|
||||||
|
|||||||
Reference in New Issue
Block a user