From: Wolfgang Bangerth Date: Fri, 10 Jul 2009 17:54:27 +0000 (+0000) Subject: The TBB can not be built in static mode (or at least I don't know how) X-Git-Tag: v8.0.0~7504 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf4d12bc7089a47f7ece7ef665b5918cf813a8ac;p=dealii.git The TBB can not be built in static mode (or at least I don't know how) so always link with it as a shared lib, regardless of whether the rest is built as static or shared libs. git-svn-id: https://svn.dealii.org/trunk@19055 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 71a88470db..5b091f5fd4 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -220,8 +220,8 @@ endif # need to link with libtbb if we're using threads ifeq ($(enable-threads),yes) - lib-contrib-tbb.g = $D/lib/libtbb_debug$(lib-suffix) - lib-contrib-tbb.o = $D/lib/libtbb$(lib-suffix) + lib-contrib-tbb.g = $D/lib/libtbb_debug$(shared-lib-suffix) + lib-contrib-tbb.o = $D/lib/libtbb$(shared-lib-suffix) endif