--- motif-2.3.4-r2.ebuild.~1.11.~	2014-08-26 13:49:52.000000000 +0200
+++ motif-2.3.4-r2.ebuild	2015-01-09 14:43:56.000000000 +0100
@@ -69,6 +69,9 @@ src_prepare() {
 
 	# "bison -y" causes runtime crashes #355795
 	export YACC=byacc
+
+	# remember the name of the C compiler for the native ABI
+	MY_NATIVE_CC=$(tc-getCC)
 }
 
 multilib_src_configure() {
@@ -83,11 +86,9 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	if ! multilib_is_native_abi; then
-		# The wmluiltok build tool is linked with libfl.a, therefore compile
-		# it for the build platform's ABI
-		emake -C tools/wml CC="$(tc-getBUILD_CC)" LIBS="-lfl" wmluiltok
-	fi
+	# The wmluiltok build tool is linked with libfl.a, so always
+	# compile it for the native ABI
+	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
 	emake
 }