Skip to content

Commit

Permalink
qt5: remove broken universal build option
Browse files Browse the repository at this point in the history
The Qt build system hasn't supported universal builds since Qt 5.0.0.
See commit ba6952b28d17b6b34f65510be645e414fa1ef6a2 in the `qtbase` Git
repository and/or `[qtbase/]dist/changes-5.0.0` in the source archive.
  • Loading branch information
UniqMartin authored and MikeMcQuaid committed Oct 18, 2015
1 parent 44bcd10 commit accd711
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions Formula/qt5.rb
Expand Up @@ -77,7 +77,6 @@ class Qt5 < Formula

keg_only "Qt 5 conflicts Qt 4 (which is currently much more widely used)."

option :universal
option "with-docs", "Build documentation"
option "with-examples", "Build examples"
option "with-developer", "Build and link with developer options"
Expand All @@ -97,8 +96,6 @@ class Qt5 < Formula
depends_on OracleHomeVarRequirement if build.with? "oci"

def install
ENV.universal_binary if build.universal?

args = ["-prefix", prefix,
"-system-zlib", "-securetransport",
"-qt-libpng", "-qt-libjpeg",
Expand All @@ -119,14 +116,6 @@ def install
args << "-dbus-linked"
end

if MacOS.prefer_64_bit? || build.universal?
args << "-arch" << "x86_64"
end

if !MacOS.prefer_64_bit? || build.universal?
args << "-arch" << "x86"
end

if build.with? "oci"
args << "-I#{ENV["ORACLE_HOME"]}/sdk/include"
args << "-L#{ENV["ORACLE_HOME"]}"
Expand Down

0 comments on commit accd711

Please sign in to comment.