mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
common/build-style/void-cross.sh: fix obtaining gcc version
This commit is contained in:
parent
281956f4eb
commit
4e3377bafd
1 changed files with 14 additions and 1 deletions
|
@ -466,6 +466,19 @@ _void_cross_test_ver() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_void_cross_test_gcc_ver() {
|
||||||
|
local ver basever
|
||||||
|
_void_cross_test_ver gcc
|
||||||
|
ver=$(cat .gcc_version)
|
||||||
|
if [ -d "gcc-${ver}" ] && [ -f "gcc-${ver}/gcc/BASE-VER" ] && [ -f "gcc-${ver}/gcc/DATESTAMP" ]; then
|
||||||
|
basever="$(cat "gcc-${ver}/gcc/BASE-VER")_$(cat "gcc-${ver}/gcc/DATESTAMP")"
|
||||||
|
mv "gcc-${ver}" "gcc-${basever}"
|
||||||
|
echo ${basever} > ${wrksrc}/.gcc_version
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
msg_error "could not determine gcc base version\n"
|
||||||
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
# Verify toolchain versions
|
# Verify toolchain versions
|
||||||
cd ${wrksrc}
|
cd ${wrksrc}
|
||||||
|
@ -483,7 +496,7 @@ do_build() {
|
||||||
|
|
||||||
_void_cross_test_ver binutils
|
_void_cross_test_ver binutils
|
||||||
_void_cross_test_ver linux
|
_void_cross_test_ver linux
|
||||||
_void_cross_test_ver gcc
|
_void_cross_test_gcc_ver
|
||||||
|
|
||||||
binutils_ver=$(cat .binutils_version)
|
binutils_ver=$(cat .binutils_version)
|
||||||
linux_ver=$(cat .linux_version)
|
linux_ver=$(cat .linux_version)
|
||||||
|
|
Loading…
Add table
Reference in a new issue