--- libgpg-error-1.22.ebuild.old	2016-05-24 02:26:17.000000000 -0400
+++ libgpg-error-1.22.ebuild	2016-05-24 21:54:05.444803053 -0400
@@ -44,6 +44,61 @@
 		$(use_enable common-lisp languages)
 	)
 
+	if tc-is-cross-compiler ; then
+		local tuple
+		case ${CHOST} in
+			aarch64*)
+				tuple=aarch64-unknown-linux-gnu;;
+			alpha*)
+				tuple=alpha-unknown-linux-gnu;;
+			arm*android*)
+				tuple=arm-unknown-linux-androideabi;;
+			arm*gnueabihf*)
+				tuple=arm-unknown-linux-gnueabihf;;
+			arm*)
+				tuple=arm-unknown-linux-gnueabi;;
+			hppa*)
+				tuple=hppa-unknown-linux-gnu;;
+			i?86*linux*)
+				tuple=i686-pc-linux-gnu;;
+			m68*)
+				tuple=m68k-unknown-linux-gnu;;
+			mips*)
+				tuple=mips-unknown-linux-gnu;;
+			mips64el*)
+				tuple=mips64el-unknown-linux-gnuabi64;;
+			mipsel*)
+				tuple=mipsel-unknown-linux-gnu;;
+			mips*)
+				tuple=mips-unknown-linux-gnu;;
+			or1k*)
+				tuple=or1k-unknown-linux-gnu;;
+			powerpc64le*)
+				tuple=powerpc64le-unknown-linux-gnu;;
+			powerpc64*)
+				tuple=powerpc64-unknown-linux-gnu;;
+			powerpc*)
+				tuple=powerpc-unknown-linux-gnu;;
+			s390*)
+				tuple=s390x-ibm-linux-gnu;;
+			sh*)
+				tuple=sh4-unknown-linux-gnu;;
+			sparc64*)
+				tuple=sparc64-unknown-linux-gnu;;
+			sparc*)
+				tuple=sparc-unknown-linux-gnu;;
+			x86_64*x32*)
+				tuple=x86_64-pc-linux-gnux32;;
+			x86_64*)
+				tuple=x86_64-pc-linux-gnu;;
+			*)
+				die "Couldn't find a target specific header in ${S}/src/syscfg";;
+		esac
+		
+		ln -s "${S}"/src/syscfg/lock-obj-pub.${tuple}.h \
+			"${S}"/src/syscfg/lock-obj-pub.linux-gnueabi.h
+	fi
+
 	multilib_is_native_abi || myeconfargs+=(
 		--disable-languages
 	)