[tor-commits] [torbrowser/maint-2.2] Revert "Settings I have to change"

[erinn at torproject.org]

commit a3648520133b397f718892eb86083553cc3d0313
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Apr 26 15:08:43 2012 +0200

    Revert "Settings I have to change"
    
    This reverts commit dc9c276c0061fe2946c6e2c5901d0a2e29ef4742.
    Accidentally included in a branch for openssl 1.0.1b fix.
---
 build-scripts/osx.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 4619c78..ed34a9b 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -31,7 +31,7 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION)
 
 ## Build machine specific settings
 # Number of cpu cores used to build in parallel
-NUM_CORES=8
+NUM_CORES=4
 
 ## Location of directory for source fetching
 FETCH_DIR=$(PWD)/build
@@ -76,7 +76,7 @@ build-qt: build-zlib build-openssl $(QT_DIR)
 	touch $(STAMP_DIR)/build-qt
 
 VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \
-	-DCMAKE_BUILD_TYPE=debug -DCMAKE_OSX_SYSROOT=${SDK_PATH} ..
+	-DCMAKE_BUILD_TYPE=debug ..
 build-vidalia: build-openssl build-qt $(VIDALIA_DIR)
 	-mkdir $(VIDALIA_DIR)/build
 	cd $(VIDALIA_DIR)/build && \