diff options
| author | Alexey Neyman <stilor@att.net> | 2017-05-29 22:32:38 -0700 |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-07-08 10:57:56 -0700 |
| commit | 567277099a487508fd228a4c56f3583db3fa96c9 (patch) | |
| tree | 19b7f40c0f6e4e6284e799dbac1098bd8805dc2d /scripts/build/internals.sh | |
| parent | 57426168ad2c7e8367786ed466c86f6aeb49b3c3 (diff) | |
| download | crosstool-ng-567277099a487508fd228a4c56f3583db3fa96c9.tar.gz crosstool-ng-567277099a487508fd228a4c56f3583db3fa96c9.tar.bz2 crosstool-ng-567277099a487508fd228a4c56f3583db3fa96c9.zip | |
Fix the references to old config variables
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/internals.sh')
| -rw-r--r-- | scripts/build/internals.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index db9b1fde..07029d0a 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -70,17 +70,18 @@ do_finish() { "${CT_TARGET}/debug-root/usr/bin/gdbserver${exe_suffix}" fi if [ "${CT_CC_gcc}" = "y" ]; then - # We can not use the version in CT_CC_GCC_VERSION because + # TBD GCC 3.x/2.x is no longer supported by ctng + # We can not use the version in CT_GCC_VERSION because # of the Linaro stuff. So, harvest the version string # directly from the gcc sources... # All gcc 4.x seem to have the version in gcc/BASE-VER # while version prior to 4.x have the version in gcc/version.c # Of course, here is not the better place to do that... - if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ]; then - gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ) + if [ -f "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ]; then + gcc_version=$( cat "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ) else gcc_version=$(sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \ - "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/version.c" \ + "${CT_SRC_DIR}/gcc/gcc/version.c" \ ) fi for _t in "bin/${CT_TARGET}-"* \ |