diff options
| author | Yuriy Kolerov <ykolerov@synopsys.com> | 2023-05-24 14:54:34 +0400 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2023-05-28 09:29:36 +1200 |
| commit | 1f1107feff1a78716afa7424ebe2330ca65044ff (patch) | |
| tree | 4523578a4acf98576de39ad2be05261f50f92765 | |
| parent | aad643b59453b5afa0b0893f3d2821c5e8f321ed (diff) | |
| download | crosstool-ng-1f1107feff1a78716afa7424ebe2330ca65044ff.tar.gz crosstool-ng-1f1107feff1a78716afa7424ebe2330ca65044ff.tar.bz2 crosstool-ng-1f1107feff1a78716afa7424ebe2330ca65044ff.zip | |
gdb: Use a relative includedir for native gdb and gdbserver
Use a relative path for include directory if gdb or gdbserver
is being built and installed for a target. Otherwise headers
are installed in ${destdir}${CT_HEADERS_DIR} - a concatenation
of ${destdir} and an absolute path to sysroot's include directory.
As a result debug-root may contain wrong paths for includes.
Signed-off-by: Yuriy Kolerov <ykolerov@synopsys.com>
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 11d73b9e..eae53634 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -245,7 +245,7 @@ do_debug_gdb_build() do_gdb_backend() { - local host prefix destdir cflags ldflags static buildtype subdir + local host prefix destdir cflags ldflags static buildtype subdir includedir local -a extra_config for arg in "$@"; do @@ -308,6 +308,17 @@ do_gdb_backend() CT_mkdir_pushd "${subdir}" fi + # Use a relative path for include directory if gdb or gdbserver + # is being built and installed for a target. Otherwise headers + # are installed in ${destdir}${CT_HEADERS_DIR} - a concatenation + # of ${destdir} and an absolute path to sysroot's include directory. + # As a result debug-root may contain wrong paths for includes. + if [ -n "${destdir}" ]; then + includedir="/usr/include" + else + includedir=${CT_HEADERS_DIR} + fi + # TBD: is passing CPP/CC/CXX/LD needed? GCC should be determining this automatically from the triplets CT_DoExecLog CFG \ CPP="${host}-cpp" \ @@ -324,7 +335,7 @@ do_gdb_backend() --target=${CT_TARGET} \ --prefix="${prefix}" \ --with-build-sysroot="${CT_SYSROOT_DIR}" \ - --includedir="${CT_HEADERS_DIR}" \ + --includedir="${includedir}" \ --disable-werror \ "${extra_config[@]}" \ |