Filter out "-mno-dynamic-no-pic"

2 files changed, 1 insertions, 10 deletions

diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc
index 5fb9433b2..e643c4c5f 100755
--- a/Library/ENV/4.3/cc
+++ b/Library/ENV/4.3/cc
@@ -120,7 +120,7 @@ class Cmd
            /^-O[0-9zs]?$/, '-fast', '-no-cpp-precomp',
            '-pedantic', '-pedantic-errors'
       when '-fopenmp', '-lgomp', '-mno-fused-madd', '-fforce-addr',
-           '-fno-defer-pop', '-fno-check-new'
+           '-fno-defer-pop', '-fno-check-new', '-mno-dynamic-no-pic'
         # clang doesn't support these flags
         args << arg if not tool =~ /^clang/
       when /^-W.*/
diff --git a/Library/Formula/valgrind.rb b/Library/Formula/valgrind.rb
index 20d5f8628..c664f47a5 100644
--- a/Library/Formula/valgrind.rb
+++ b/Library/Formula/valgrind.rb
@@ -50,15 +50,6 @@ class Valgrind < Formula
   end if MacOS.version == :mavericks
 
   def install
-    if (build.head? || MacOS.version == :mavericks) && ENV.compiler == :clang
-      # Clang does not support '-mno-dynamic-no-pic'. Before clang 3.4,
-      # this is simply a warning, however, with clang 3.4 and later,
-      # this becomes a fatal error.
-      #
-      # Reported upstream in https://bugs.kde.org/show_bug.cgi?id=330257
-      inreplace 'Makefile.all.am', '-mno-dynamic-no-pic', ''
-    end
-
     args = %W[
       --disable-dependency-tracking
       --prefix=#{prefix}