--- /usr/portage/x11-plugins/enigmail/enigmail-0.95.3.ebuild	2007-09-25 11:37:40.000000000 -0500
+++ enigmail-0.95.3.ebuild	2007-09-30 02:07:29.000000000 -0500
@@ -153,20 +153,24 @@
 	# requirements while compiling
 	edit_makefiles
 
+	# Doesn't like to build with CHOST-specific commands.
+	MY_CC=$(tc-getCC)
+	MY_CXX=$(tc-getCXX)
+
 	# Only build the parts necessary to support building enigmail
-	emake -j1 export || die "make export failed"
-	emake -C modules/libreg || die "make modules/libreg failed"
-	emake -C xpcom/string || die "make xpcom/string failed"
-	emake -C xpcom || die "make xpcom failed"
-	emake -C xpcom/obsolete || die "make xpcom/obsolete failed"
+	emake CC=$MY_CC CXX=$MY_CXX -j1 export || die "make export failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C modules/libreg || die "make modules/libreg failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C xpcom/string || die "make xpcom/string failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C xpcom || die "make xpcom failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C xpcom/obsolete || die "make xpcom/obsolete failed"
 
 	# Build the enigmail plugin
 	einfo "Building Enigmail plugin..."
-	emake -C ${S}/mailnews/extensions/enigmail || die "make enigmail failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C ${S}/mailnews/extensions/enigmail || die "make enigmail failed"
 
 	# Package the enigmail plugin; this may be the easiest way to collect the
 	# necessary files
-	emake -j1 -C ${S}/mailnews/extensions/enigmail xpi || die "make xpi failed"
+	emake CC=$MY_CC CXX=$MY_CXX -j1 -C ${S}/mailnews/extensions/enigmail xpi || die "make xpi failed"
 }
 
 src_install() {