diff options
| author | Alexey Neyman <stilor@att.net> | 2019-03-12 23:08:58 -0700 |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2019-03-12 23:08:58 -0700 |
| commit | a75a770595079619e61e1623698e420427924cf9 (patch) | |
| tree | c5e69f76be9b072e2e28b8110f8b63ce306cdc64 | |
| parent | de36f78f898940e7611b177e9ccd97516f131caf (diff) | |
| download | crosstool-ng-a75a770595079619e61e1623698e420427924cf9.tar.gz crosstool-ng-a75a770595079619e61e1623698e420427924cf9.tar.bz2 crosstool-ng-a75a770595079619e61e1623698e420427924cf9.zip | |
Make the proc_service.h workaround apply to gdbserver
... when it is compiled without the native GDB.
Also, fix the gdbserver to be installed without a program prefix in this
case, as it was before the unification of the GDB backend.
Signed-off-by: Alexey Neyman <stilor@att.net>
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index e62e5dff..15e0684d 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -22,12 +22,9 @@ do_debug_gdb_build() local -a cross_extra_config CT_DoStep INFO "Installing cross-gdb" + CT_mkdir_pushd "${CT_BUILD_DIR}/build-gdb-cross" cross_extra_config=( "${CT_GDB_CROSS_EXTRA_CONFIG_ARRAY[@]}" ) - - mkdir -p "${CT_BUILD_DIR}/build-gdb-cross" - cd "${CT_BUILD_DIR}/build-gdb-cross" - if [ "${CT_GDB_CROSS_PYTHON}" = "y" ]; then if [ -z "${CT_GDB_CROSS_PYTHON_BINARY}" ]; then if [ "${CT_CANADIAN}" = "y" -o "${CT_CROSS_NATIVE}" = "y" ]; then @@ -92,6 +89,7 @@ do_debug_gdb_build() >"${CT_PREFIX_DIR}/share/gdb/gdbinit" fi # Install gdbinit sample + CT_Popd CT_EndStep fi @@ -100,9 +98,9 @@ do_debug_gdb_build() local subdir CT_DoStep INFO "Installing native gdb" + CT_mkdir_pushd "${CT_BUILD_DIR}/build-gdb-native" - mkdir -p "${CT_BUILD_DIR}/build-gdb-native" - cd "${CT_BUILD_DIR}/build-gdb-native" + native_extra_config+=("--program-prefix=") # GDB on Mingw depends on PDcurses, not ncurses if [ "${CT_MINGW32}" != "y" ]; then @@ -155,6 +153,7 @@ do_debug_gdb_build() unset ac_cv_func_strncmp_works + CT_Popd CT_EndStep # native gdb build fi } @@ -252,6 +251,12 @@ do_gdb_backend() CT_DoLog EXTRA "Configuring ${buildtype} gdb" CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" + # Run configure/make in the matching subdirectory so that any fixups + # prepared in a given subdirectory apply. + if [ -n "${subdir}" ]; then + CT_mkdir_pushd "${subdir}" + fi + # TBD: is passing CPP/CC/CXX/LD needed? GCC should be determining this automatically from the triplets CT_DoExecLog CFG \ CPP="${host}-cpp" \ @@ -277,4 +282,8 @@ do_gdb_backend() CT_DoLog EXTRA "Installing ${buildtype} gdb" CT_DoExecLog ALL make install ${destdir:+DESTDIR="${destdir}"} + + if [ -n "${subdir}" ]; then + CT_Popd + fi } |