i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ArchitectureSetup: fix library name map

Browse Source 
It's too early to use the MultiArch* rules yet, since the TARGET_*
variables haven't been initialized yet.
This commit is contained in:
Ingo Weinhold
2013-08-05 18:52:33 +02:00
parent 93cfb72270
commit b2b6052e40
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+13 -4
View File
@@ -231,22 +231,31 @@ rule ArchitectureSetup architecture
= $(HAIKU_GCC_LIB_DIR_$(architecture)) ; = $(HAIKU_GCC_LIB_DIR_$(architecture)) ;
# init library name map # init library name map
local libraryGrist = "" ;
if $(architecture) != $(HAIKU_PACKAGING_ARCHS[1]) {
libraryGrist = $(architecture) ;
}
local i ; local i ;
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 {
local library = lib$(i).so ;
HAIKU_LIBRARY_NAME_MAP_$(architecture)_$(i) HAIKU_LIBRARY_NAME_MAP_$(architecture)_$(i)
= [ MultiArchDefaultGristFiles lib$(i).so : : $(architecture) ] ; = $(library:G=$(libraryGrist)) ;
} }
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
= [ 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 ;
if $(architecture) != $(HAIKU_PACKAGING_ARCHS[1]) {
HAIKU_LIBRARY_NAME_MAP_$(architecture)_input_server
= <nogrist>input_server ;
} else {
HAIKU_LIBRARY_NAME_MAP_$(architecture)_input_server
= <$(architecture)>input_server ;
}
} }