diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-04-03 17:22:38 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-04-03 17:22:38 (GMT) |
| commit | 9571a97a4d2e3aedc5fa6807a920c619b9467c77 (patch) | |
| tree | 32773c921778f631487c227255e5c9ffc543e017 /scripts/build/debug/300-gdb.sh | |
| parent | 8aab16323219b37902c680bb332ad748dc7d5890 (diff) | |
| parent | 0fc6f1c47e1ea3f18c4c30f834c9ae4bb3913aa9 (diff) | |
Merge pull request #672 from stilor/freebsd-fixescrosstool-ng-1.23.0-rc2
Freebsd fixes
Diffstat (limited to 'scripts/build/debug/300-gdb.sh')
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index b2cb08f..68510e1 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -48,7 +48,7 @@ do_debug_gdb_build() { if [ "${CT_GDB_CROSS}" = "y" ]; then local -a cross_extra_config - local gcc_version + local gcc_version p _p CT_DoStep INFO "Installing cross-gdb" CT_DoLog EXTRA "Configuring cross-gdb" @@ -75,7 +75,20 @@ do_debug_gdb_build() { *) cross_extra_config+=("--enable-threads");; esac if [ "${CT_GDB_CROSS_PYTHON}" = "y" ]; then - cross_extra_config+=( "--with-python=yes" ) + if [ -z "${CT_GDB_CROSS_PYTHON_BINARY}" ]; then + for p in python python3 python2; do + _p=$( which "${p}" || true ) + if [ -n "${_p}" ]; then + cross_extra_config+=( "--with-python=${_p}" ) + break + fi + done + if [ -z "${_p}" ]; then + CT_Abort "Python support requested in cross-gdb, but Python not found. Set CT_GDB_CROSS_PYTHON_BINARY in your config." + fi + else + cross_extra_config+=( "--with-python=${CT_GDB_CROSS_PYTHON_BINARY}" ) + fi else cross_extra_config+=( "--with-python=no" ) fi @@ -127,6 +140,8 @@ do_debug_gdb_build() { CT_DoLog DEBUG "Extra config passed: '${cross_extra_config[*]}'" CT_DoExecLog CFG \ + CC_FOR_BUILD="${CT_BUILD}-gcc" \ + CFLAGS_FOR_BUILD="${cflags_for_build}" \ CPP="${CPP_for_gdb}" \ CC="${CC_for_gdb}" \ CXX="${CXX_for_gdb}" \ @@ -242,6 +257,8 @@ do_debug_gdb_build() { CT_DoLog DEBUG "Extra config passed: '${native_extra_config[*]}'" CT_DoExecLog CFG \ + CC_FOR_BUILD="${CT_BUILD}-gcc" \ + CFLAGS_FOR_BUILD="${cflags_for_build}" \ CPP="${CPP_for_gdb}" \ CC="${CC_for_gdb}" \ CXX="${CXX_for_gdb}" \ @@ -316,6 +333,8 @@ do_debug_gdb_build() { gdbserver_extra_config+=("--disable-gas") CT_DoExecLog CFG \ + CC_FOR_BUILD="${CT_BUILD}-gcc" \ + CFLAGS_FOR_BUILD="${cflags_for_build}" \ CC="${CT_TARGET}-${CT_CC}" \ CPP="${CT_TARGET}-cpp" \ LD="${CT_TARGET}-ld" \ |