From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 24 Aug 2009 10:16:48 +0000 (-0000)
Subject:    Merged from trunk -r14140:14151
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d532862fd107f4d25deac401b7cd67124e8c92a2;p=portage.git

   Merged from trunk -r14140:14151

   | 14151   | make sure we can deal with arches like x86-fbsd, like is     |
   | grobian | done in bin/ebuild-helpers/prepstrip                         |

svn path=/main/branches/prefix/; revision=14152
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 26d992c46..aea4d797b 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1862,7 +1862,7 @@ _source_ebuild() {
 
 	# This needs to be exported since prepstrip is a separate shell script.
 	[[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED
-	eval "[[ -n \$QA_PRESTRIPPED_$ARCH ]] && export QA_PRESTRIPPED_$ARCH"
+	eval "[[ -n \$QA_PRESTRIPPED_${ARCH/-/_} ]] && export QA_PRESTRIPPED_${ARCH/-/_}"
 }
 
 if ! hasq "$EBUILD_PHASE" clean cleanrm ; then