--- /usr/portage/dev-lang/ocaml/ocaml-3.12.1.ebuild	2011-07-11 07:01:07.000000000 +0200
+++ ocaml-3.12.1.ebuild	2011-08-12 06:10:03.000000000 +0200
@@ -65,15 +65,19 @@
 	use X || myconf="${myconf} -no-graph"
 	use gdbm || myconf="${myconf} -no-dbm"
 
+	# multilib portage fix
+	STD_LDFLAGS="$(raw-ldflags)"
+	MUL_LDFLAGS="LDFLAGS_${ABI}"
+	EMUL_LDFLAGS="${!MUL_LDFLAGS}"
 	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix /usr \
+	RAW_LDFLAGS="${STD_LDFLAGS/-m32/${EMUL_LDFLAGS}}" ./configure -prefix /usr \
 		--bindir /usr/bin \
 		--libdir /usr/$(get_libdir)/ocaml \
 		--mandir /usr/share/man \
 		-host "${CHOST}" \
-		-cc "$(tc-getCC)" \
-		-as "$(tc-getAS)" \
-		-aspp "$(tc-getCC) -c" \
+		-cc "$(tc-getCC) ${CFLAGS}" \
+		-as "$(tc-getAS) ${ASFLAGS}" \
+		-aspp "$(tc-getCC) ${CFLAGS} -c" \
 		-partialld "$(tc-getLD) -r" \
 		--with-pthread ${myconf} || die "configure failed!"