macvim: cleanup python usage.

1 files changed, 0 insertions, 41 deletions

diff --git a/Library/Formula/macvim.rb b/Library/Formula/macvim.rb
index 4a5817ecc..ffd0e296f 100644
--- a/Library/Formula/macvim.rb
+++ b/Library/Formula/macvim.rb
@@ -71,18 +71,6 @@ class Macvim < Formula
       args << "--enable-python3interp" if build.with? "python3"
     end
 
-    # MacVim seems to link Python by `-framework Python` (instead of
-    # `python-config --ldflags`) and so we have to pass the -F to point to
-    # where the Python.framework is located, we want it to use!
-    # Also the -L is needed for the correct linking. This is a mess but we have
-    # to wait until MacVim is really able to link against different Python's
-    # on the Mac. Note configure detects brewed python correctly, but that
-    # is ignored.
-    # See https://github.com/Homebrew/homebrew/issues/17908
-    if python2 and python2.framework? and not build.with? "python3"
-      ENV.prepend 'LDFLAGS', "-L#{python2.libdir} -F#{python2.framework}"
-    end
-
     unless MacOS::CLT.installed?
       # On Xcode-only systems:
       # Macvim cannot deal with "/Applications/Xcode.app/Contents/Developer" as
@@ -94,35 +82,6 @@ class Macvim < Formula
 
     system "./configure", *args
 
-    if build.with? "python" and build.with? "python3"
-      # On 64-bit systems, we need to avoid a 32-bit Framework Python.
-      # MacVim doesn't check Python while compiling.
-      python do
-        if MacOS.prefer_64_bit? and python.framework? and not archs_for_command("#{python.prefix}/Python").include? :x86_64
-          opoo "Detected a framework Python that does not have 64-bit support built in:"
-          puts <<-EOS.undent
-            #{python.prefix}
-
-            Dynamic loading Python library requires the same architecture.
-
-            Note that a framework Python in /Library/Frameworks/Python.framework is
-            the "MacPython" version, and not the system-provided version which is in:
-              /System/Library/Frameworks/Python.framework
-          EOS
-        end
-      end
-      # Help vim find Python's library as absolute path.
-      python do
-        inreplace 'src/auto/config.mk', /-DDYNAMIC_PYTHON#{python.if3then3}_DLL=\\".*\\"/, %Q[-DDYNAMIC_PYTHON#{python.if3then3}_DLL=\'\"#{python.prefix}/Python\"\'] if python.framework?
-      end
-      # Force vim loading different Python on same time, may cause vim crash.
-      unless python.brewed?
-        opoo "You seem to have a version of Python not installed by Homebrew. Attempting to modify config.h. You may see warning message during brewing."
-        inreplace 'src/auto/config.h', "/* #undef PY_NO_RTLD_GLOBAL */", "#define PY_NO_RTLD_GLOBAL 1"
-        inreplace 'src/auto/config.h', "/* #undef PY3_NO_RTLD_GLOBAL */", "#define PY3_NO_RTLD_GLOBAL 1"
-      end
-    end
-
     if build.include? "custom-icons"
       # Get the custom font used by the icons
       cd 'src/MacVim/icons' do