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 26d992c46ee193eab7a2dc4cfabeced719e2f51a..aea4d797bcc68ac1d08862b9bb735f0896143435 100755 (executable)
--- 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