commit e513c36dc9d7825d27dd511caee84c846ce01117
Author: Sebastian Hahn <[email protected]>
Date: Wed Apr 18 04:01:06 2012 +0200
OSX: Correctly set min version for Vidalia
Each line in a make rule gets executed in its own shell, so exporting
something in one line means it'll be gone in the next. We only need the
MACOSX_DEPLOYMENT_TARGET during cmake, so only set it there.
Fixes bug 4263.
---
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 493052e..6a4bac5 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -78,9 +78,9 @@ build-qt: build-zlib build-openssl $(QT_DIR)
VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE)
-DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \
-DCMAKE_BUILD_TYPE=debug ..
build-vidalia: build-openssl build-qt $(VIDALIA_DIR)
- export MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION)
-mkdir $(VIDALIA_DIR)/build
- cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \
+ cd $(VIDALIA_DIR)/build && \
+ MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) cmake $(VIDALIA_OPTS) \
&& make -j $(NUM_CORES) && make dist-osx-libraries
cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install
cp -r $(QT_DIR)/src/gui/mac/qt_menu.nib $(VIDALIA)/Contents/Resources/
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
