From 1039d278567a6b972da27eea5144294b80a345f4 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 31 Jan 2022 10:17:43 -0700 Subject: util/crossgcc: Update this for normailze_dirs() Currently, the function normalize_dirs() fails if the directories lib32 and lib64 don't exist. That can be fixed by using an rm -rf on it instead of rmdir. The cmake build doesn't create those directories, so was showing a failure message after the build was already completed. That's fixed by removing normailze_dirs() from the build_CMAKE() function. Signed-off-by: Martin Roth Change-Id: Iea6e3ca57fb91ff1234be875861b27a78972d9ca Reviewed-on: https://review.coreboot.org/c/coreboot/+/61515 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: HAOUAS Elyes --- util/crossgcc/buildgcc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index b0c7707b9a..f27dd01e80 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -121,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 @@ -834,8 +834,6 @@ build_CMAKE() { # shellcheck disable=SC2086 $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed - - normalize_dirs } build_NASM() { -- cgit v1.2.3