ArchitectureSetup: fix library map for secondary arch
The libraries where resolved to the library targets for the primary architecture.
This commit is contained in:
@@ -235,14 +235,16 @@ rule ArchitectureSetup architecture
|
|||||||
for i in be bnetapi debug device game GL locale mail media midi midi2
|
for i in be bnetapi debug device game GL locale mail media midi midi2
|
||||||
network opengl package root screensaver textencoding tracker
|
network opengl package root screensaver textencoding tracker
|
||||||
translation z {
|
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_LIBRARY_NAME_MAP_$(architecture)_libstdc++
|
||||||
= $(HAIKU_LIBSTDC++_$(architecture)) ;
|
= $(HAIKU_LIBSTDC++_$(architecture)) ;
|
||||||
HAIKU_LIBRARY_NAME_MAP_$(architecture)_libsupc++
|
HAIKU_LIBRARY_NAME_MAP_$(architecture)_libsupc++
|
||||||
= $(HAIKU_LIBSUPC++_$(architecture)) ;
|
= $(HAIKU_LIBSUPC++_$(architecture)) ;
|
||||||
HAIKU_LIBRARY_NAME_MAP_$(architecture)_input_server
|
HAIKU_LIBRARY_NAME_MAP_$(architecture)_input_server
|
||||||
= <nogrist>input_server ;
|
= [ MultiArchIfPrimary <nogrist>input_server
|
||||||
|
: <$(architecture)>input_server : $(architecture) ] ;
|
||||||
HAIKU_LIBRARY_NAME_MAP_$(architecture)_localestub
|
HAIKU_LIBRARY_NAME_MAP_$(architecture)_localestub
|
||||||
= <$(architecture)>liblocalestub.a ;
|
= <$(architecture)>liblocalestub.a ;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user