aboutsummaryrefslogtreecommitdiffstats
path: root/vespabase
diff options
context:
space:
mode:
authorVegard Sjonfjell <vegard@yahoo-inc.com>2016-10-05 15:34:15 +0200
committerVegard Sjonfjell <vegard@yahoo-inc.com>2016-10-05 15:34:15 +0200
commitd22ceb89608611124291c5c9e30f7f70bac8aa98 (patch)
tree960ff704f4fc0f0fdb9dcc776e87e957b420853b /vespabase
parent23cd65bb2d4a25f2d52a70f573ce4a3e25ee6b8c (diff)
parente8b571ebc3eb2592f16ca546a65bf318ba0f4df7 (diff)
Merge branch 'master' into voffeloff/move-jsontesthelper
Diffstat (limited to 'vespabase')
-rwxr-xr-xvespabase/src/start-cbinaries.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh
index 91ce8edede4..1809f889244 100755
--- a/vespabase/src/start-cbinaries.sh
+++ b/vespabase/src/start-cbinaries.sh
@@ -83,6 +83,8 @@ if [ "$VESPA_USE_VALGRIND" = "all" ]; then
no_valgrind=false
fi
+export STD_THREAD_PREVENT_TRY_CATCH=true
+
# special malloc setup; we should make some better mechanism for this
#
export GLIBCXX_FORCE_NEW=1