Permalink
Browse files

Moved MACOSX_DEPLOYMENT_TARGET to the deploy script to allow building…

… against the current system
  • Loading branch information...
kintel committed Mar 4, 2014
1 parent 8635e94 commit e54d0cca6ed5a37858e36f676a507d4c36a99456
Showing with 8 additions and 8 deletions.
  1. +0 −8 openscad.pro
  2. +8 −0 scripts/publish-macosx.sh
View
@@ -79,14 +79,6 @@ macx {
APP_RESOURCES.files = OpenSCAD.sdef dsa_pub.pem icons/SCAD.icns
QMAKE_BUNDLE_DATA += APP_RESOURCES
LIBS += -framework Cocoa -framework ApplicationServices
-
- # FIXME: Somehow, setting the deployment target to a lower version causes a
- # seldom crash in debug mode (e.g. the minkowski2-test):
- # frame #4: 0x00007fff8b7d5be5 libc++.1.dylib`std::runtime_error::~runtime_error() + 55
- # frame #5: 0x0000000100150df5 OpenSCAD`CGAL::Uncertain_conversion_exception::~Uncertain_conversion_exception(this=0x0000000105044488) + 21 at Uncertain.h:78
- # The reason for the crash appears to be linking with libgcc_s,
- # but it's unclear what's really going on
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
}
else {
TARGET = openscad
@@ -52,6 +52,14 @@ fi
# Turn off ccache, just for safety
PATH=${PATH//\/opt\/local\/libexec\/ccache:}
+# FIXME: Somehow, setting the deployment target to a lower version causes a
+# seldom crash in debug mode (e.g. the minkowski2-test):
+# frame #4: 0x00007fff8b7d5be5 libc++.1.dylib`std::runtime_error::~runtime_error() + 55
+# frame #5: 0x0000000100150df5 OpenSCAD`CGAL::Uncertain_conversion_exception::~Uncertain_conversion_exception(this=0x0000000105044488) + 21 at Uncertain.h:78
+# The reason for the crash appears to be linking with libgcc_s,
+# but it's unclear what's really going on
+export MACOSX_DEPLOYMENT_TARGET=10.6
+
# This is the same location as DEPLOYDIR in macosx-build-dependencies.sh
export OPENSCAD_LIBRARIES=$PWD/../libraries/homebrew

0 comments on commit e54d0cc

Please sign in to comment.