--- trunk/include/multilib.sminc	2012/02/11 19:34:51	11030
+++ trunk/include/multilib.sminc	2012/03/02 15:27:45	11300
@@ -69,7 +69,8 @@
 	export ABI_LIBDIR="lib"
 	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
 	then
-		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
+		local saved_ldflags="${LDFLAGS}"
+		export LDFLAGS="${LDFLAGS} -L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
 	fi
 	# keep pkgconfig clean
 	local orig_pkg_config_path="${PKG_CONFIG_PATH}"
@@ -109,9 +110,10 @@
 	# run any given command
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR LDFLAGS
+	unset ABI CC CXX ABI_LIBDIR
 	# keep pkgconfig clean
 	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
+	export LDFLAGS="${saved_ldflags}"
 
 	# restore original settings
 	if [[ ${EMUL_LINUX_32} = true ]]
@@ -129,6 +131,7 @@
 	export ABI_LIBDIR="lib64"
 	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
 	then
+		local saved_ldflags="${LDFLAGS}"
 		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
 	fi
 	# keep pkgconfig clean
@@ -155,9 +158,10 @@
 	# run any given command
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR LDFLAGS
+	unset ABI CC CXX ABI_LIBDIR
 	# keep pkgconfig clean
 	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
+	export LDFLAGS="${saved_ldflags}"
 }
 
 only-m32()