Merge 4.16
Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
This commit is contained in:
@@ -36,12 +36,11 @@ GMP_VERSION=6.2.1
|
||||
MPFR_VERSION=4.1.0
|
||||
MPC_VERSION=1.2.1
|
||||
GCC_VERSION=11.2.0
|
||||
GCC_AUTOCONF_VERSION=2.69
|
||||
BINUTILS_VERSION=2.37
|
||||
IASL_VERSION=20210331
|
||||
IASL_VERSION=20211217
|
||||
# CLANG version number
|
||||
CLANG_VERSION=12.0.0
|
||||
CMAKE_VERSION=3.20.3
|
||||
CLANG_VERSION=13.0.1
|
||||
CMAKE_VERSION=3.22.2
|
||||
NASM_VERSION=2.15.05
|
||||
|
||||
# GCC toolchain archive locations
|
||||
@@ -122,7 +121,7 @@ normalize_dirs()
|
||||
mkdir -p "$DESTDIR$TARGETDIR/lib"
|
||||
test -d "$DESTDIR$TARGETDIR/lib32" && mv "$DESTDIR$TARGETDIR"/lib32/* "$DESTDIR$TARGETDIR/lib"
|
||||
test -d "$DESTDIR$TARGETDIR/lib64" && mv "$DESTDIR$TARGETDIR"/lib64/* "$DESTDIR$TARGETDIR/lib"
|
||||
rmdir -p "$DESTDIR$TARGETDIR/lib32" "$DESTDIR$TARGETDIR/lib64"
|
||||
rm -rf "$DESTDIR$TARGETDIR/lib32" "$DESTDIR$TARGETDIR/lib64"
|
||||
|
||||
perl -pi -e "s,/lib32,/lib," "$DESTDIR$TARGETDIR"/lib/*.la
|
||||
perl -pi -e "s,/lib64,/lib," "$DESTDIR$TARGETDIR"/lib/*.la
|
||||
@@ -835,8 +834,6 @@ build_CMAKE() {
|
||||
# shellcheck disable=SC2086
|
||||
$MAKE $JOBS || touch .failed
|
||||
$MAKE install DESTDIR=$DESTDIR || touch .failed
|
||||
|
||||
normalize_dirs
|
||||
}
|
||||
|
||||
build_NASM() {
|
||||
@@ -852,7 +849,6 @@ build_NASM() {
|
||||
|
||||
print_supported() {
|
||||
case "$PRINTSUPPORTED" in
|
||||
AUTOCONF|autoconf) printf "%s\n" "$GCC_AUTOCONF_VERSION";;
|
||||
BINUTILS|binutils) printf "%s\n" "$BINUTILS_VERSION";;
|
||||
CLANG|clang) printf "%s\n" "$CLANG_VERSION";;
|
||||
GCC|gcc) printf "%s\n" "$GCC_VERSION";;
|
||||
|
Reference in New Issue
Block a user