Index: /src/router/Makefile.laguna
===================================================================
--- /src/router/Makefile.laguna	(revision 18675)
+++ /src/router/Makefile.laguna	(revision 18676)
@@ -246,17 +246,18 @@
 
 ifneq ($(CONFIG_NOOPT),y)
-	rm -rf /tmp/mklibs-out
-	rm -f /tmp/mklibs-progs
+	rm -rf /tmp/$(ARCHITECTURE)/mklibs-out
+	rm -f /tmp/$(ARCHITECTURE)/mklibs-progs
+	mkdir -p /tmp/$(ARCHITECTURE)/
 	find $(TARGETDIR) -type f -perm +100 -exec \
 		file -r -N -F '' {} + | \
-		awk ' /executable.*dynamically/ { print $$1 }' > /tmp/mklibs-progs
+		awk ' /executable.*dynamically/ { print $$1 }' > /tmp/$(ARCHITECTURE)/mklibs-progs
 
 	find $(TARGETDIR) -type f -name \*.so\* -exec \
 		file -r -N -F '' {} + | \
-		awk ' /shared object/ { print $$1 }' >> /tmp/mklibs-progs
-
-	mkdir -p /tmp/mklibs-out
+		awk ' /shared object/ { print $$1 }' >> /tmp/$(ARCHITECTURE)/mklibs-progs
+
+	mkdir -p /tmp/$(ARCHITECTURE)/mklibs-out
 	mklibs.py -D \
-		-d /tmp/mklibs-out \
+		-d /tmp/$(ARCHITECTURE)/mklibs-out \
 		--sysroot $(TARGETDIR) \
 		-L /lib \
@@ -264,6 +265,6 @@
 		--ldlib /lib/ld-uClibc.so.0 \
 		--target $(ARCH)-linux-uclibc \
-		`cat /tmp/mklibs-progs` 2>&1
-	cp /tmp/mklibs-out/* $(TARGETDIR)/lib
+		`cat /tmp/$(ARCHITECTURE)/mklibs-progs` 2>&1
+	cp /tmp/$(ARCHITECTURE)/mklibs-out/* $(TARGETDIR)/lib
 endif
 	rm -f $(TARGETDIR)/lib/*.a