From 97ff4fa2a5a587f265b835192916df98c55a28a4 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 14 Jun 2013 23:06:29 +0000 Subject: [PATCH] [SCons] Fix handling of blas_lapack_dir and boost_lib_dir These need to be added to LIBPATH as entries in a list, otherwise LIBPATH ends up concatenating the strings for each as a single entry. --- SConstruct | 4 ++-- src/SConscript | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 0b90fda49..3c498c0cb 100644 --- a/SConstruct +++ b/SConstruct @@ -710,10 +710,10 @@ if env['boost_inc_dir']: env.Append(CPPPATH=env['boost_inc_dir']) if env['boost_lib_dir']: - env.Append(LIBPATH=env['boost_lib_dir']) + env.Append(LIBPATH=[env['boost_lib_dir']]) if env['blas_lapack_dir']: - env.Append(LIBPATH=env['blas_lapack_dir']) + env.Append(LIBPATH=[env['blas_lapack_dir']]) if (env['use_sundials'] == 'default' and (env['sundials_include'] or env['sundials_libdir'])): diff --git a/src/SConscript b/src/SConscript index 82f5c1d81..37fa6dd17 100644 --- a/src/SConscript +++ b/src/SConscript @@ -61,6 +61,9 @@ if localenv['OS'] in ('Darwin', 'Windows'): if (localenv['use_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['toolchain'] == 'mingw': localenv.Append(LINKFLAGS=['-static-libgcc', '-static-libstdc++'])