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/companion_tools | |
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/companion_tools')
-rw-r--r-- | scripts/build/companion_tools/050-make.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index 4c6dc4c..aecea1a 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -23,6 +23,9 @@ do_companion_tools_make_for_build() if [ "${CT_MAKE_GMAKE_SYMLINK}" = "y" ]; then CT_DoExecLog ALL ln -sv make "${CT_BUILD_COMPTOOLS_DIR}/bin/gmake" fi + if [ "${CT_MAKE_GNUMAKE_SYMLINK}" = "y" ]; then + CT_DoExecLog ALL ln -sv make "${CT_BUILD_COMPTOOLS_DIR}/bin/gnumake" + fi CT_EndStep } @@ -39,6 +42,9 @@ do_companion_tools_make_for_host() if [ "${CT_MAKE_GMAKE_SYMLINK}" = "y" ]; then CT_DoExecLog ALL ln -sv make "${CT_PREFIX_DIR}/bin/gmake" fi + if [ "${CT_MAKE_GNUMAKE_SYMLINK}" = "y" ]; then + CT_DoExecLog ALL ln -sv make "${CT_PREFIX_DIR}/bin/gnumake" + fi CT_EndStep } |