From 765628f6fd1f76bc0a23de190646846ded1c6995 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Wed, 5 Feb 2014 15:11:58 -0500
Subject: [PATCH] tools-musl: automatically detect amd64 vs i686

---
 tools-musl/run.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 4ff37858..c9127b4e 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -1,15 +1,18 @@
 #!/bin/bash
 
-MYARCH=${1:-"amd64"}
+TEST_ARCH=$(file -b /usr/lib/libc.so | sed -e 's/^.*shared object, //' -e 's/,.*$//')
 
-if [[ "$MYARCH" != "amd64" && "$MYARCH" != "i686" ]]; then
+if [[ "${TEST_ARCH}" == "Intel 80386" ]]; then
+	MYARCH="i686"
+	ALTARCH="i386"
+elif [[ "${TEST_ARCH}" == "x86-64" ]]; then
+	MYARCH="amd64"
+	ALTARCH="x86_64"
+else
 	echo "Unsupported arch $MYARCH"
 	exit
 fi
 
-[[ "$MYARCH" == "amd64" ]] && ALTARCH="x86_64"
-[[ "$MYARCH" == "i686" ]] && ALTARCH="i386"
-
 ROOTFS="stage4-${MYARCH}-musl-vanilla"
 PWD="$(pwd)"
 
@@ -18,9 +21,9 @@ prepare_etc () {
 	cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/
 
 	if [[ "$MYARCH" == "amd64" ]]; then
-		sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/make.conf
+		sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/portage/make.conf
 	elif [[ "$MYARCH" == "i686" ]]; then
-		sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/make.conf
+		sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/portage/make.conf
 	fi
 }