From a255f12aac2ff91cd7f951b457ceea54bdd238fe Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 26 Apr 2017 17:35:35 +0200 Subject: [PATCH] UPSTREAM: crossgcc: fix DESTDIR builds We need to rewrite libtool's files (foo.la) a couple of times so it knows where to look (while still whining that $DESTDIR$TARGET != $TARGET. well, duh.) BUG=none BRANCH=none TEST=none Change-Id: Ib444c60924e48f5adcefeecccdb0a24250075b12 Signed-off-by: Patrick Georgi Original-Commit-Id: 790aab6c778c35e0fff662ee03be04cc79c81685 Original-Change-Id: I54cafd47c76d855222ba905b5eb4533a23bdfd34 Original-Signed-off-by: Patrick Georgi Original-Reviewed-on: https://review.coreboot.org/19463 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Philippe Mathieu-Daud Original-Reviewed-by: Stefan Reinauer Reviewed-on: https://chromium-review.googlesource.com/490074 Commit-Ready: Furquan Shaikh --- util/crossgcc/buildgcc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 3ebde85892..9239b5dae6 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -534,7 +534,7 @@ build_MPFR() { # work around build problem of libgmp.la if [ "$DESTDIR" != "" ]; then - perl -pi -e "s,$DESTDIR,," $DESTDIR$TARGETDIR/libgmp.la + perl -pi -e "s,$DESTDIR,," $DESTDIR$TARGETDIR/lib/libgmp.la fi } @@ -543,9 +543,20 @@ build_MPC() { --infodir=$TARGETDIR/info --with-mpfr=$DESTDIR$TARGETDIR \ --with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || \ touch .failed + + # work around build problem of libmpfr.la + if [ "$DESTDIR" != "" ]; then + perl -pi -e "s,$TARGETDIR/lib/libgmp.la,$DESTDIR\$&," $DESTDIR$TARGETDIR/lib/libmpfr.la + fi + $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed + # work around build problem of libmpfr.la + if [ "$DESTDIR" != "" ]; then + perl -pi -e "s,$DESTDIR,," $DESTDIR$TARGETDIR/lib/libmpfr.la + fi + normalize_dirs }