summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Duplichan <scott@notabs.org>2014-12-12 20:21:40 -0600
committerPatrick Georgi <pgeorgi@google.com>2014-12-15 16:49:42 +0100
commit4270a9777cc4319cf6e33594f30f2069dc4060c8 (patch)
tree05a49cfc4187324a750dd98ca87ec3afede73d2b
parent59919ad1162ce66502b10b20f7663638d18f3d00 (diff)
buildgcc: Fix msys2 crossgcc build fail
A leading double slash can result when $DESTDIR/$TARGETDIR is expanded in the libelf portion of buildgcc. The leading double slash causes buildgcc to fail when run from Windows/Msys2. Replace $DESTDIR/$TARGETDIR with $DESTDIR$TARGETDIR to avoid the problem. Change-Id: Ide2bae41c07c1566f80104c3a2e2acab53de0d17 Signed-off-by: Scott Duplichan <scott@notabs.org> Reviewed-on: http://review.coreboot.org/7788 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
-rwxr-xr-xutil/crossgcc/buildgcc2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 7f2643fa60..a35bf33ef4 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -437,7 +437,7 @@ printf "Building libelf ${LIBELF_VERSION} ... "
../${LIBELF_DIR}/configure --disable-shared --prefix=$TARGETDIR \
--infodir=$TARGETDIR/info CFLAGS="$HOSTCFLAGS" || touch .failed
$MAKE $JOBS || touch .failed
- $MAKE install prefix=$DESTDIR/$TARGETDIR || touch .failed
+ $MAKE install prefix=$DESTDIR$TARGETDIR || touch .failed
normalize_dirs