diff options
| author |   Alexey Neyman <stilor@att.net> | 2019-03-02 23:45:37 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2019-03-02 23:45:37 (GMT) |
| commit | 862c35457d2cb95124d802d5dbeddb4815dc08c1 (patch) | |
| tree | e9a44a2349106ca8adb442b1073763df8c681454 /scripts/build/debug/300-gdb.sh | |
| parent | c4126d9397353a74ca5aff602dd2c0c527e1dd07 (diff) | |
Fix build of glibc 2.29 on systems with obsolete host programs
- Force building make as a companion tool if host make is older than
4.0 (CentOS 7 currently has 3.82)
- Disable 2.29 as a choice if host python is older than 3.4
(CentOS 7 has 2.6 unless python from EPEL is installed)
- Python2 emits its version information to STDERR. Ugh.
While there, also use the detected host Python for GDB configuration.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/debug/300-gdb.sh')
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 72d13df..9901217 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -64,15 +64,12 @@ do_debug_gdb_build() { if [ "${CT_GDB_CROSS_PYTHON}" = "y" ]; then 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." + if [ "${CT_CANADIAN}" = "y" -o "${CT_CROSS_NATIVE}" = "y" ]; then + CT_Abort "For canadian build, Python wrapper runnable on the build machine must be provided. Set CT_GDB_CROSS_PYTHON_BINARY." + elif [ "${CT_CONFIGURE_has_python}" = "y" ]; then + cross_extra_config+=("--with-python=${python}") + else + CT_Abort "Python support requested in GDB, but Python not found. Set CT_GDB_CROSS_PYTHON_BINARY." fi else cross_extra_config+=("--with-python=${CT_GDB_CROSS_PYTHON_BINARY}") |