Permalink
Browse files

phantomjs, qt: update superenv optimisations fix.

  • Loading branch information...
MikeMcQuaid committed Nov 18, 2013
1 parent 35d152d commit 6e87dfd85f74799c761f49628ff0463a677671a2
Showing with 5 additions and 15 deletions.
  1. +3 −6 Formula/phantomjs.rb
  2. +2 −9 Formula/qt.rb
View
@@ -20,12 +20,9 @@ def patches
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'
View
@@ -83,15 +83,8 @@ def install
"-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?

0 comments on commit 6e87dfd

Please sign in to comment.