From e54d0cca6ed5a37858e36f676a507d4c36a99456 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Mon, 3 Mar 2014 21:32:52 -0500 Subject: [PATCH] Moved MACOSX_DEPLOYMENT_TARGET to the deploy script to allow building against the current system --- openscad.pro | 8 -------- scripts/publish-macosx.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openscad.pro b/openscad.pro index 9f8e75f3..1e0c9d5a 100644 --- a/openscad.pro +++ b/openscad.pro @@ -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 diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh index a5fe7840..490b8ca6 100755 --- a/scripts/publish-macosx.sh +++ b/scripts/publish-macosx.sh @@ -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