From 7b6b09c95df5a7be7d01a8199f4e98a623d27008 Mon Sep 17 00:00:00 2001
From: Misty De Meo
Date: Sat, 28 Sep 2013 14:57:17 -0700
Subject: Move ld64 into SharedEnvExtension

Superenv is being tested on Xcode 3.1.4, so this needs to be supported
in both ENVs, not just stdenv.
---
 Library/Homebrew/extend/ENV/shared.rb | 7 +++++++
 Library/Homebrew/extend/ENV/std.rb    | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index 33f2ee5a8..2257b8cf7 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -170,6 +170,13 @@ module SharedEnvExtension
     set_cpu_flags(flags)
   end
 
+  # ld64 is a newer linker provided for Xcode 2.5
+  def ld64
+    ld64 = Formula.factory('ld64')
+    self['LD'] = ld64.bin/'ld'
+    append "LDFLAGS", "-B#{ld64.bin.to_s+"/"}"
+  end
+
   def warn_about_non_apple_gcc(gcc)
     opoo "Experimental support for non-Apple GCC enabled. Some builds may fail!"
 
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index 3a20b5d30..d0422a9f5 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -366,11 +366,4 @@ module Stdenv
       Hardware::CPU.cores
     end
   end
-
-  # ld64 is a newer linker provided for Xcode 2.5
-  def ld64
-    ld64 = Formula.factory('ld64')
-    self['LD'] = ld64.bin/'ld'
-    append "LDFLAGS", "-B#{ld64.bin.to_s+"/"}"
-  end
 end
-- 
cgit v1.2.3