From 9b318f3c902a4f68def8a6d0d29b65f76b4aae07 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 4 Jul 2016 18:16:49 -0400 Subject: [PATCH] [SCons] Always link cantera_shared to its dependencies This is not strictly required on Linux, but it doesn't hurt. See #318. --- src/SConscript | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/SConscript b/src/SConscript index d033f880b..3322df4b1 100644 --- a/src/SConscript +++ b/src/SConscript @@ -41,16 +41,14 @@ localenv.Depends(lib, localenv['config_h_target']) install('$inst_libdir', lib) env['cantera_staticlib'] = lib -# Windows and OS X require shared libraries at link time -if localenv['OS'] in ('Darwin', 'Windows', 'Cygwin'): - if (localenv['system_sundials'] == 'y'): - localenv.Append(LIBS=localenv['sundials_libs'], - LIBPATH=localenv['sundials_libdir']) - if localenv['blas_lapack_libs']: - localenv.Append(LIBS=localenv['blas_lapack_libs'], - LIBPATH=localenv['blas_lapack_dir']) - if localenv['system_fmt']: - localenv.Append(LIBS='fmt') +if (localenv['system_sundials'] == 'y'): + localenv.Append(LIBS=localenv['sundials_libs'], + LIBPATH=localenv['sundials_libdir']) +if localenv['blas_lapack_libs']: + localenv.Append(LIBS=localenv['blas_lapack_libs'], + LIBPATH=localenv['blas_lapack_dir']) +if localenv['system_fmt']: + localenv.Append(LIBS='fmt') # Build the Cantera shared library if localenv['layout'] != 'debian':