dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add configure switches for libbfd and bfd extra debug info.

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-09-09 20:19:26 +01:00
parent eaf9aa6571
commit d7853db2fd
1 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config.lib
View File

@@ -95,6 +95,8 @@ set_default() {
with_nforenum="1"
with_grfcodec="1"
with_sse="1"
with_libbfd="1"
with_bfd_extra_debug="1"
save_params_array="
build
@@ -172,6 +174,8 @@ set_default() {
with_grfcodec
with_nforenum
with_sse
with_libbfd
with_bfd_extra_debug
CC CXX CFLAGS CXXFLAGS LDFLAGS CFLAGS_BUILD CXXFLAGS_BUILD LDFLAGS_BUILD"
}
@@ -465,6 +469,14 @@ detect_params() {
--with-sse) with_sse="1";;
--with-sse=*) with_sse="$optarg";;
--without-libbfd) with_libbfd="0";;
--with-libbfd) with_libbfd="1";;
--with-libbfd=*) with_libbfd="$optarg";;
--without-bfd-extra-debug) with_bfd_extra_debug="0";;
--with-bfd-extra-debug) with_bfd_extra_debug="1";;
--with-bfd-extra-debug=*) with_bfd_extra_debug="$optarg";;
CC=* | --CC=*) CC="$optarg";;
CXX=* | --CXX=*) CXX="$optarg";;
CFLAGS=* | --CFLAGS=*) CFLAGS="$optarg";;
@@ -1571,6 +1583,7 @@ EOL
fi
rm -f tmp.config.libdl
if [ "$with_libbfd" = "1" ]; then
"$cc_host" $CFLAGS $LDFLAGS -o tmp.config.bfd -x c++ - -lbfd 2> /dev/null << EOL
#define PACKAGE 1
#define PACKAGE_VERSION 1
@@ -1589,12 +1602,13 @@ EOL
log 1 "checking libbfd... found"
LIBS="$LIBS -lbfd"
CFLAGS="$CFLAGS -DWITH_BFD"
if [ $enable_debug -lt 1 ]; then
if [ $enable_debug -lt 1 ] && [ "$with_bfd_extra_debug" = "1" ]; then
CFLAGS="$CFLAGS -g1"
fi
fi
rm -f tmp.config.bfd
fi
fi
if [ "$os" = "MINGW" ]; then
"$cc_host" $CFLAGS $LDFLAGS -o tmp.config.dbghelp -x c++ - 2> /dev/null << EOL
@@ -1614,6 +1628,7 @@ EOL
log 1 "checking dbghelp... found"
CFLAGS="$CFLAGS -DWITH_DBGHELP"
if [ "$with_libbfd" = "1" ]; then
"$cc_host" $CFLAGS $LDFLAGS -o tmp.config.bfd -x c++ - -lbfd -liberty -lintl 2> /dev/null << EOL
#define PACKAGE 1
#define PACKAGE_VERSION 1
@@ -1633,12 +1648,13 @@ EOL
LIBS="$LIBS -lbfd -liberty -lintl"
CFLAGS="$CFLAGS -DWITH_BFD"
if [ $enable_debug -lt 1 ]; then
if [ $enable_debug -lt 1 ] && [ "$with_bfd_extra_debug" = "1" ]; then
CFLAGS="$CFLAGS -g1"
fi
fi
rm -f tmp.config.bfd
fi
fi
rm -f tmp.config.dbghelp
fi
@@ -3652,6 +3668,8 @@ showhelp() {
echo " --without-grfcodec disable usage of grfcodec and re-generation of base sets"
echo " --without-threads disable threading support"
echo " --without-sse disable SSE support (x86/x86_64 only)"
echo " --without-libbfd disable libbfd support, used for improved crash logs (MinGW and Unix/glibc only)"
echo " --without-bfd-extra-debug disable extra debugging information when using libbfd (MinGW and Unix/glibc only)"
echo ""
echo "Some influential environment variables:"
echo " CC C compiler command"