From ab55f5421c81dc629e487bf4b8bb402657cb1bc4 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 6 Jan 2021 20:27:20 +0000
Subject: [PATCH] fix(cli): remove defunct --[no-]native-comp-macos-fixes
 option

The underlying patching code was removed in v0.4.1 (commit
70bf6b05d584976632b2fd2947c0bf692f5b6421), as it was no longer needed,
but the related CLI flag and README info was mistakenly left in place.
---
 README.md             | 6 ------
 build-emacs-for-macos | 9 +--------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 3357dea..80c7f48 100644
--- a/README.md
+++ b/README.md
@@ -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)
@@ -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:
 
 ```
diff --git a/build-emacs-for-macos b/build-emacs-for-macos
index 8fa9c01..4acdd49 100755
--- a/build-emacs-for-macos
+++ b/build-emacs-for-macos
@@ -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"
@@ -733,7 +733,6 @@ end
 
 if __FILE__ == $PROGRAM_NAME
   cli_options = {
-    macos_fixes: true,
     native_full_aot: false,
     parallel: Etc.nprocessors,
     rsvg: false,
@@ -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