From a9a7ed482ff561bbc5721595851851fd048c3f59 Mon Sep 17 00:00:00 2001
From: Philipp Deppenwiese <zaolin@das-labor.org>
Date: Thu, 15 Jun 2017 23:12:43 -0600
Subject: [PATCH] UPSTREAM: util/crossgcc: Fix musl libc support

Disable NLS for libelf.

BUG=none
BRANCH=none
TEST=none

Change-Id: I62c0118af88a03e6c39d4c45ba7ee2ce23e945bf
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Ignore-CL-Reviewed-on: https://review.coreboot.org/20228
Original-Commit-Id: 9a848dde8b34a854af716670f5c993c49c1ab22e
Original-Change-Id: Ia4d01393771ccdff9e0498d7efd1bbdd11cff8db
Original-Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org>
Original-Reviewed-on: https://review.coreboot.org/20235
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Philippe Mathieu-Daud <philippe.mathieu.daude@gmail.com>
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/539234
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
---
 util/crossgcc/buildgcc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 63abc59a02..3a67ef85cc 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -562,7 +562,7 @@ build_MPC() {
 
 build_LIBELF() {
 	CC="$CC" CFLAGS="$HOSTCFLAGS" libelf_cv_elf_h_works=no \
-	../${LIBELF_DIR}/configure --disable-shared --prefix=$TARGETDIR \
+	../${LIBELF_DIR}/configure --disable-shared --disable-nls --prefix=$TARGETDIR \
 		--infodir=$TARGETDIR/info CFLAGS="$HOSTCFLAGS" || touch .failed
 	$MAKE $JOBS || touch .failed
 	$MAKE install prefix=$DESTDIR$TARGETDIR || touch .failed