From f7d5e4c647a7cb317eade01979fbc358bb8e68bb Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 5 Aug 2013 06:39:10 +0200
Subject: [PATCH] ArchitectureSetup: fix library map for secondary arch

The libraries where resolved to the library targets for the primary
architecture.
---
 build/jam/ArchitectureRules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 9bce49cfd1..dd5e4332e2 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -235,14 +235,16 @@ rule ArchitectureSetup architecture
 	for i in be bnetapi debug device game GL locale mail media midi midi2
 			network opengl package root screensaver textencoding tracker
 			translation z {
-		HAIKU_LIBRARY_NAME_MAP_$(architecture)_$(i) = lib$(i).so ;
+		HAIKU_LIBRARY_NAME_MAP_$(architecture)_$(i)
+			= [ MultiArchDefaultGristFiles lib$(i).so : : $(architecture) ] ;
 	}
 	HAIKU_LIBRARY_NAME_MAP_$(architecture)_libstdc++
 		= $(HAIKU_LIBSTDC++_$(architecture)) ;
 	HAIKU_LIBRARY_NAME_MAP_$(architecture)_libsupc++
 		= $(HAIKU_LIBSUPC++_$(architecture)) ;
 	HAIKU_LIBRARY_NAME_MAP_$(architecture)_input_server
-		= <nogrist>input_server ;
+		= [ MultiArchIfPrimary <nogrist>input_server
+			: <$(architecture)>input_server : $(architecture) ] ;
 	HAIKU_LIBRARY_NAME_MAP_$(architecture)_localestub
 		= <$(architecture)>liblocalestub.a ;
 }