forked from Imagelibrary/binutils-gdb
gdb: fix detection of compilation and linking flags for source-highlight
Currently there are two problems with the detection of source-highlight via pkg-config in GDB's configure script: 1. The LDFLAGS variable is used to pass the 'pkg-config --libs' output to AC_LINK_IFELSE, which results in the "-L/some/path -lsource-highlight" preceding the conftest.cpp, which can result in a failure to find symbols referenced in conftest.cpp, if the linker is using --as-needed by default. 2. The CFLAGS variable is used to pass the 'pkg-config --cflags' output to AC_LINK_IFELSE. However, as the current language is C++, AC_LINK_IFELSE will actuall use CXXFLAGS, not CFLAGS, so any flags returned from pkg-config will not be seen. This patch fixes both of these mistakes, allowing GDB to correctly configure and build using source-highlight installed into a custom prefix, e.g. ~/opt/gdb-git (because the system version of source-highlight is too old).
This commit is contained in:
committed by
Andrew Burgess
parent
955b0ef98e
commit
6a8fe63330
@@ -1242,10 +1242,10 @@ either use --disable-source-highlight or dnl
|
||||
# This situation can occur for instance when using a source highlight
|
||||
# library compiled with g++ 7.5.0 while building gdb with g++ 4.8.5.
|
||||
AC_LANG_PUSH(C++)
|
||||
save_CFLAGS="$CFLAGS"
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
CFLAGS="$CFLAGS $srchigh_pkg_cflags"
|
||||
LDFLAGS="$LDFLAGS $srchigh_pkg_libs"
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
CXXFLAGS="$CXXFLAGS $srchigh_pkg_cflags"
|
||||
LIBS="$LIBS $srchigh_pkg_libs"
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[#include <srchilite/sourcehighlight.h>],
|
||||
@@ -1255,8 +1255,8 @@ either use --disable-source-highlight or dnl
|
||||
[have_usable_source_highlight=yes],
|
||||
[have_usable_source_highlight=no]
|
||||
)
|
||||
CFLAGS="$save_CFLAGS"
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
CXXFLAGS="$save_CXXFLAGS"
|
||||
LIBS="$save_LIBS"
|
||||
AC_LANG_POP(C++)
|
||||
|
||||
if test "${have_usable_source_highlight}" = "yes"; then
|
||||
|
||||
Reference in New Issue
Block a user