--- spidermonkey-1.7.0-r1.ebuild	2010-03-07 23:38:56.000000000 +0100
+++ spidermonkey-1.7.0-r1.ebuild	2010-08-04 00:29:13.865860849 +0200
@@ -17,7 +17,6 @@
 S="${WORKDIR}/js/src"
 
 RDEPEND="threadsafe? ( dev-libs/nspr )"
-
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -25,7 +24,8 @@
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-1.5-build.patch"
 	epatch "${FILESDIR}/${PN}-1.6-header.patch"
-	epatch "${FILESDIR}/${P}-threadsafe.diff"
+	epatch "${FILESDIR}/${P}-threadsafe.diff" \
+		"${FILESDIR}"/${P}-ldflags.patch
 	if [[ ${CHOST} == *-freebsd* ]]; then
 		# Don't try to be smart, this does not work in cross-compile anyway
 		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
@@ -37,10 +37,11 @@
 	tc-export CC LD AR
 	if use threadsafe; then
 		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
-		|| die "emake with threadsafe enabled failed";
+			XLDFLAGS="$(raw-ldflags)" HOST_LDFLAGS="${LDFLAGS}" \
+				|| die "emake with threadsafe enabled failed";
 	else
-		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" \
-		|| die "emake without threadsafe enabled failed";
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" XLDFLAGS="$(raw-ldflags)" \
+		HOST_LDFLAGS="${LDFLAGS}" || die "emake without threadsafe enabled failed";
 	fi
 }