Merge pull request #4260 from sjackman/superenv-mac

superenv: Move macOS-specific files to shims/mac/
2018-06-01 20:46:59 +01:00 · 2018-06-01 20:46:59 +01:00 · 4e03bbeefe
commit 4e03bbeefe
parent 2863a88499 a618681cf0
52 changed files with 43 additions and 2 deletions
--- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
@ -5,8 +5,7 @@ module Superenv
    # @private
    def bin
      return unless DevelopmentTools.installed?
-
-      (HOMEBREW_SHIMS_PATH/"super").realpath
+      (HOMEBREW_SHIMS_PATH/"mac/super").realpath
    end
  end

--- a/Library/Homebrew/shims/mac/super/ant
+++ b/Library/Homebrew/shims/mac/super/ant
--- a/Library/Homebrew/shims/mac/super/apr-1-config
+++ b/Library/Homebrew/shims/mac/super/apr-1-config
--- a/Library/Homebrew/shims/mac/super/bsdmake
+++ b/Library/Homebrew/shims/mac/super/bsdmake
--- a/Library/Homebrew/shims/mac/super/c++
+++ b/Library/Homebrew/shims/mac/super/c++
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/c89
+++ b/Library/Homebrew/shims/mac/super/c89
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/c99
+++ b/Library/Homebrew/shims/mac/super/c99
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/cc
+++ b/Library/Homebrew/shims/mac/super/cc
@ -0,0 +1 @@
+../../super/cc
--- a/Library/Homebrew/shims/mac/super/clang
+++ b/Library/Homebrew/shims/mac/super/clang
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/clang++
+++ b/Library/Homebrew/shims/mac/super/clang++
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/cpp
+++ b/Library/Homebrew/shims/mac/super/cpp
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++
+++ b/Library/Homebrew/shims/mac/super/g++
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-4.2
+++ b/Library/Homebrew/shims/mac/super/g++-4.2
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-4.3
+++ b/Library/Homebrew/shims/mac/super/g++-4.3
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-4.4
+++ b/Library/Homebrew/shims/mac/super/g++-4.4
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-4.5
+++ b/Library/Homebrew/shims/mac/super/g++-4.5
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-4.6
+++ b/Library/Homebrew/shims/mac/super/g++-4.6
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-4.7
+++ b/Library/Homebrew/shims/mac/super/g++-4.7
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-4.8
+++ b/Library/Homebrew/shims/mac/super/g++-4.8
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-4.9
+++ b/Library/Homebrew/shims/mac/super/g++-4.9
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-5
+++ b/Library/Homebrew/shims/mac/super/g++-5
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-6
+++ b/Library/Homebrew/shims/mac/super/g++-6
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/g++-7
+++ b/Library/Homebrew/shims/mac/super/g++-7
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc
+++ b/Library/Homebrew/shims/mac/super/gcc
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-4.2
+++ b/Library/Homebrew/shims/mac/super/gcc-4.2
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-4.3
+++ b/Library/Homebrew/shims/mac/super/gcc-4.3
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-4.4
+++ b/Library/Homebrew/shims/mac/super/gcc-4.4
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-4.5
+++ b/Library/Homebrew/shims/mac/super/gcc-4.5
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-4.6
+++ b/Library/Homebrew/shims/mac/super/gcc-4.6
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-4.7
+++ b/Library/Homebrew/shims/mac/super/gcc-4.7
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-4.8
+++ b/Library/Homebrew/shims/mac/super/gcc-4.8
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-4.9
+++ b/Library/Homebrew/shims/mac/super/gcc-4.9
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-5
+++ b/Library/Homebrew/shims/mac/super/gcc-5
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-6
+++ b/Library/Homebrew/shims/mac/super/gcc-6
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/gcc-7
+++ b/Library/Homebrew/shims/mac/super/gcc-7
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/git
+++ b/Library/Homebrew/shims/mac/super/git
@ -0,0 +1 @@
+../../scm/git
--- a/Library/Homebrew/shims/mac/super/gmake
+++ b/Library/Homebrew/shims/mac/super/gmake
--- a/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-g++-4.2
+++ b/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-g++-4.2
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-gcc-4.2
+++ b/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-gcc-4.2
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/ld
+++ b/Library/Homebrew/shims/mac/super/ld
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/llvm-g++
+++ b/Library/Homebrew/shims/mac/super/llvm-g++
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/llvm-g++-4.2
+++ b/Library/Homebrew/shims/mac/super/llvm-g++-4.2
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/llvm-gcc
+++ b/Library/Homebrew/shims/mac/super/llvm-gcc
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/llvm-gcc-4.2
+++ b/Library/Homebrew/shims/mac/super/llvm-gcc-4.2
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/llvm_clang
+++ b/Library/Homebrew/shims/mac/super/llvm_clang
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/llvm_clang++
+++ b/Library/Homebrew/shims/mac/super/llvm_clang++
@ -0,0 +1 @@
+cc
--- a/Library/Homebrew/shims/mac/super/make
+++ b/Library/Homebrew/shims/mac/super/make
--- a/Library/Homebrew/shims/mac/super/mig
+++ b/Library/Homebrew/shims/mac/super/mig
--- a/Library/Homebrew/shims/mac/super/pod2man
+++ b/Library/Homebrew/shims/mac/super/pod2man
--- a/Library/Homebrew/shims/mac/super/sed
+++ b/Library/Homebrew/shims/mac/super/sed
--- a/Library/Homebrew/shims/mac/super/svn
+++ b/Library/Homebrew/shims/mac/super/svn
@ -0,0 +1 @@
+../../scm/svn
--- a/Library/Homebrew/shims/mac/super/xcrun
+++ b/Library/Homebrew/shims/mac/super/xcrun