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

Build: in ArchitectureSetup, use the cpu variable instead..

Browse Source 
of the HAIKU_ARCH variable, which is the primary architecture cpu.
This commit is contained in:
Jérôme Duval
2018-01-31 18:32:35 +01:00
parent 51290f11aa
commit 272a3e2ced
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+5 -5
View File
@@ -168,20 +168,20 @@ rule ArchitectureSetup architecture
# library and executable glue code # library and executable glue code
local commonGlueCode = local commonGlueCode =
<src!system!glue!$(architecture)>init_term_dyn.o <src!system!glue!$(architecture)>init_term_dyn.o
<src!system!glue!arch!$(HAIKU_ARCH)!$(architecture)>crti.o <src!system!glue!arch!$(cpu)!$(architecture)>crti.o
<src!system!glue!arch!$(HAIKU_ARCH)!$(architecture)>crtn.o <src!system!glue!arch!$(cpu)!$(architecture)>crtn.o
; ;
HAIKU_LIBRARY_BEGIN_GLUE_CODE_$(architecture) = HAIKU_LIBRARY_BEGIN_GLUE_CODE_$(architecture) =
<src!system!glue!arch!$(HAIKU_ARCH)!$(architecture)>crti.o <src!system!glue!arch!$(cpu)!$(architecture)>crti.o
<$(architecture)>crtbeginS.o <$(architecture)>crtbeginS.o
<src!system!glue!$(architecture)>init_term_dyn.o <src!system!glue!$(architecture)>init_term_dyn.o
; ;
HAIKU_LIBRARY_END_GLUE_CODE_$(architecture) = HAIKU_LIBRARY_END_GLUE_CODE_$(architecture) =
<$(architecture)>crtendS.o <$(architecture)>crtendS.o
<src!system!glue!arch!$(HAIKU_ARCH)!$(architecture)>crtn.o <src!system!glue!arch!$(cpu)!$(architecture)>crtn.o
; ;
HAIKU_EXECUTABLE_BEGIN_GLUE_CODE_$(architecture) = HAIKU_EXECUTABLE_BEGIN_GLUE_CODE_$(architecture) =
<src!system!glue!arch!$(HAIKU_ARCH)!$(architecture)>crti.o <src!system!glue!arch!$(cpu)!$(architecture)>crti.o
<$(architecture)>crtbeginS.o <$(architecture)>crtbeginS.o
<src!system!glue!$(architecture)>start_dyn.o <src!system!glue!$(architecture)>start_dyn.o
<src!system!glue!$(architecture)>init_term_dyn.o <src!system!glue!$(architecture)>init_term_dyn.o