research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCons] Always link to static standard libraries with MinGW

Browse source
This commit is contained in:
Ray Speth 2014-02-24 03:25:34 +00:00
parent 6e72f8930f
commit ea040e1a5e
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -731,6 +731,8 @@ if env['coverage']:
print 'Error: coverage testing is only available with GCC.' print 'Error: coverage testing is only available with GCC.'
exit(0) exit(0)
if env['toolchain'] == 'mingw':
env.Append(LINKFLAGS=['-static-libgcc', '-static-libstdc++'])
def config_error(message): def config_error(message):
print 'ERROR:', message print 'ERROR:', message

3
src/SConscript
View file

@ -68,9 +68,6 @@ if localenv['OS'] in ('Darwin', 'Windows', 'Cygwin'):
localenv.Append(LIBS=localenv['boost_libs'], localenv.Append(LIBS=localenv['boost_libs'],
LIBPATH=localenv['boost_lib_dir']) LIBPATH=localenv['boost_lib_dir'])
if localenv['toolchain'] == 'mingw':
localenv.Append(LINKFLAGS=['-static-libgcc', '-static-libstdc++'])
# Build the Cantera shared library using the correct name # Build the Cantera shared library using the correct name
if localenv['layout'] != 'debian': if localenv['layout'] != 'debian':
# Define the name according to the environmental variable # Define the name according to the environmental variable

1
src/matlab/SConscript
View file

@ -25,7 +25,6 @@ if localenv['OS'] == 'Windows':
linkflags.append('/MACHINE:' + machtype) linkflags.append('/MACHINE:' + machtype)
elif localenv['CC'] == 'gcc': elif localenv['CC'] == 'gcc':
linkflags.append('-Wl,--export-all-symbols') linkflags.append('-Wl,--export-all-symbols')
linkflags.extend(['-static-libgcc', '-static-libstdc++'])
elif localenv['OS'] == 'Darwin': elif localenv['OS'] == 'Darwin':
linklibs = list(env['cantera_libs']) linklibs = list(env['cantera_libs'])