-static-libgcc needs to be in CFLAGS for libtool linking to work

This commit is contained in:
Yevgen Muntyan 2015-12-08 01:10:43 -08:00
parent 1999014336
commit 28dbe0e82d
2 changed files with 4 additions and 4 deletions

View File

@ -83,7 +83,7 @@ if _static_libgcc:
# os.environ['CXXFLAGS'] = "-I%s/include -mms-bitfields -march=i686 %s" % (prefix, _def_cflags) # os.environ['CXXFLAGS'] = "-I%s/include -mms-bitfields -march=i686 %s" % (prefix, _def_cflags)
# os.environ['OBJCFLAGS'] = "-I%s/include -mms-bitfields -march=i686 %s" % (prefix, _def_cflags) # os.environ['OBJCFLAGS'] = "-I%s/include -mms-bitfields -march=i686 %s" % (prefix, _def_cflags)
_cflags = "-mms-bitfields -march=i686 %s" % (_def_cflags,) _cflags = "-mms-bitfields -march=i686 %s %s" % (_def_cflags, _static_libgcc)
_cflags_cmdline = ' CFLAGS="%(_cflags)s" CXXFLAGS="%(_cflags)s" OBJCFLAGS="%(_cflags)s"' % {'_cflags': _cflags} _cflags_cmdline = ' CFLAGS="%(_cflags)s" CXXFLAGS="%(_cflags)s" OBJCFLAGS="%(_cflags)s"' % {'_cflags': _cflags}
def _remove_gstabs(module): def _remove_gstabs(module):
module_autogenargs[module] = module_autogenargs[module].replace('-gstabs+', '-g').replace('-gstabs', '-g') module_autogenargs[module] = module_autogenargs[module].replace('-gstabs+', '-g').replace('-gstabs', '-g')

View File

@ -79,9 +79,9 @@ export STRIP=$_mingw_tool_prefix-strip
export LDFLAGS="$STATIC_LIBGCC -L$mgwtargetdir/lib" export LDFLAGS="$STATIC_LIBGCC -L$mgwtargetdir/lib"
export CPPFLAGS="-I$mgwtargetdir/include" export CPPFLAGS="-I$mgwtargetdir/include"
export CFLAGS="-mms-bitfields -march=i686 $_def_cflags" export CFLAGS="-mms-bitfields -march=i686 $_def_cflags $STATIC_LIBGCC"
export CXXFLAGS="-mms-bitfields -march=i686 $_def_cflags" export CXXFLAGS="-mms-bitfields -march=i686 $_def_cflags $STATIC_LIBGCC"
export OBJCFLAGS="-mms-bitfields -march=i686 $_def_cflags" export OBJCFLAGS="-mms-bitfields -march=i686 $_def_cflags $STATIC_LIBGCC"
export PKG_CONFIG_LIBDIR="$mgwtargetdir/lib/pkgconfig" export PKG_CONFIG_LIBDIR="$mgwtargetdir/lib/pkgconfig"
export PKG_CONFIG_PATH="$mgwtargetdir/lib/pkgconfig" export PKG_CONFIG_PATH="$mgwtargetdir/lib/pkgconfig"