commit 5042c42451efea7cf96deeebbc4c3a33d6bc6d15 Author: Sebastian Hahn sebastian@torproject.org Date: Sat Jan 28 14:30:52 2012 +0100

OSX: Remove the universal option when building qt

The rationale is that we don't build universal bundles, so we don't need a universal qt. --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 13b802c..20ea849 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -83,7 +83,7 @@ endif cd $(OPENSSL_DIR) && make install

QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) -QT_BUILD_PREFS=-system-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \ +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ -fast -release -no-framework -nomake demos -nomake examples $(SDK) QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib build-qt: