phantomjs, qt: update superenv optimisations fix.

Closes #24438.

2 files changed, 5 insertions, 15 deletions

diff --git a/Library/Formula/phantomjs.rb b/Library/Formula/phantomjs.rb
index 475a08295..9ec9c9113 100644
--- a/Library/Formula/phantomjs.rb
+++ b/Library/Formula/phantomjs.rb
@@ -20,12 +20,9 @@ class Phantomjs < Formula
   def install
     inreplace 'src/qt/preconfig.sh', '-arch x86', '-arch x86_64' if MacOS.prefer_64_bit?
     args = ['--confirm', '--qt-config']
-    # Fix Clang/LLVM 3DNow! intrinsic failure.
-    if MacOS.version >= :lion
-      args << '-no-3dnow'
-    else
-      args << '-no-3dnow -no-ssse3'
-    end
+    # we have to disable these to avoid triggering Qt optimization code
+    # that will fail in superenv (in --env=std, Qt seems aware of this)
+    args << '-no-3dnow -no-ssse3' if superenv?
     system './build.sh', *args
     bin.install 'bin/phantomjs'
     (share+'phantomjs').install 'examples'
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index d6615c176..7a537c6c4 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -83,15 +83,8 @@ class Qt < Formula
             "-cocoa", "-fast", "-release"]
 
     # we have to disable these to avoid triggering optimization code
-    # that will fail in superenv, perhaps because we rename clang to cc and
-    # Qt thinks it can build with special assembler commands.
-    # In --env=std, Qt seems aware of this.
-    # But we want superenv, because it allows to build Qt in non-standard
-    # locations and with Xcode-only.
-    if superenv?
-      args << '-no-3dnow'
-      args << '-no-ssse3'
-    end
+    # that will fail in superenv (in --env=std, Qt seems aware of this)
+    args << '-no-3dnow' << '-no-ssse3' if superenv?
 
     args << "-L#{MacOS::X11.lib}" << "-I#{MacOS::X11.include}" if MacOS::X11.installed?