Skip to content

Commit

Permalink
fix(cli): remove defunct --[no-]native-comp-macos-fixes option
Browse files Browse the repository at this point in the history
The underlying patching code was removed in v0.4.1 (commit
70bf6b0), as it was no longer needed,
but the related CLI flag and README info was mistakenly left in place.
  • Loading branch information
jimeh committed Jan 6, 2021
1 parent eb09d5f commit ab55f54
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ Options:
--[no-]xwidgets Enable/disable XWidgets (default: enabled if supported)
--[no-]native-comp Enable/disable native-comp (default: enabled if supported)
--[no-]native-full-aot Enable/disable NATIVE_FULL_AOT / Ahead of Time compilation (default: disabled)
--[no-]native-comp-macos-fixes
Enable/disable fix based on feature/native-comp-macos-fixes branch (default: enabled if native-comp supported)
--rsvg Enable SVG image support via librsvg, can yield a unstable build (default: disabled)
--no-titlebar Apply no-titlebar patch (default: disabled)
--no-frame-refocus Apply no-frame-refocus patch (default: disabled)
Expand Down Expand Up @@ -143,10 +141,6 @@ Building a Emacs.app with native-comp support
branch is now supported without much hassle thanks to the newly released
`libgccjit` Homebrew formula.

Changes from the `feature/native-comp-macos-fixes` branch are also applied
through a custom patch process which should be more future-proof compared to a
regular git diff patch.

To build a Emacs.app with native compilation enabled, simply run:

```
Expand Down
9 changes: 1 addition & 8 deletions build-emacs-for-macos
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ class Build
"#{brew_dir}/opt/texinfo/bin",
ENV['PATH']
].compact.join(':')

ENV['LIBRARY_PATH'] = [
ENV['LIBRARY_PATH'],
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"
Expand Down Expand Up @@ -733,7 +733,6 @@ end

if __FILE__ == $PROGRAM_NAME
cli_options = {
macos_fixes: true,
native_full_aot: false,
parallel: Etc.nprocessors,
rsvg: false,
Expand Down Expand Up @@ -780,12 +779,6 @@ if __FILE__ == $PROGRAM_NAME
cli_options[:native_full_aot] = v
end

opts.on('--[no-]native-comp-macos-fixes',
'Enable/disable fix based on feature/native-comp-macos-fixes ' \
'branch (default: enabled if native-comp supported)') do |v|
cli_options[:macos_fixes] = v
end

opts.on('--rsvg', 'Enable SVG image support via librsvg, ' \
'can yield a unstable build (default: disabled)') do
cli_options[:rsvg] = true
Expand Down

0 comments on commit ab55f54

Please sign in to comment.