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

Fix #11076 - build failing on Haiku.

Browse Source 
* Haiku does not currently provide crtbeginS.o and crtendS.o, so
  we fall back to crtbegin.o and crtend.o.
  
This should not have any ill-effects, as the available compilers on
Haiku do not use __cxa_atexit() yet.
This commit is contained in:
Oliver Tappe
2014-07-27 16:00:53 +02:00
parent ad3d3335df
commit 36f3164c3e
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+29 -7
View File
@@ -206,6 +206,18 @@ rule ArchitectureSetup architecture
} }
# library and executable glue code # library and executable glue code
local crtBegin ;
local crtEnd ;
# TODO: use crtbeginS.o and crtendS.o unconditionally once we have
# switched to new compiler packages
if [ Glob $(HAIKU_GCC_LIB_DIR_$(architecture)) : crtbeginS.o ] {
crtBegin = <$(architecture)>crtbeginS.o ;
crtEnd = <$(architecture)>crtendS.o ;
} else {
crtBegin = <$(architecture)>crtbegin.o ;
crtEnd = <$(architecture)>crtend.o ;
}
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!$(HAIKU_ARCH)!$(architecture)>crti.o
@@ -213,24 +225,23 @@ rule ArchitectureSetup architecture
; ;
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!$(HAIKU_ARCH)!$(architecture)>crti.o
<$(architecture)>crtbeginS.o $(crtBegin)
<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 $(crtEnd)
<src!system!glue!arch!$(HAIKU_ARCH)!$(architecture)>crtn.o <src!system!glue!arch!$(HAIKU_ARCH)!$(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!$(HAIKU_ARCH)!$(architecture)>crti.o
<$(architecture)>crtbeginS.o $(crtBegin)
<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
; ;
HAIKU_EXECUTABLE_END_GLUE_CODE_$(architecture) HAIKU_EXECUTABLE_END_GLUE_CODE_$(architecture)
= $(HAIKU_LIBRARY_END_GLUE_CODE_$(architecture)) ; = $(HAIKU_LIBRARY_END_GLUE_CODE_$(architecture)) ;
SEARCH on <$(architecture)>crtbeginS.o <$(architecture)>crtendS.o SEARCH on $(crtBegin) $(crtEnd) = $(HAIKU_GCC_LIB_DIR_$(architecture)) ;
= $(HAIKU_GCC_LIB_DIR_$(architecture)) ;
# init library name map # init library name map
local libraryGrist = "" ; local libraryGrist = "" ;
@@ -472,10 +483,21 @@ rule KernelArchitectureSetup architecture
# compiling (part of) the boot loader. # compiling (part of) the boot loader.
# kernel add-on glue code # kernel add-on glue code
HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = <$(architecture)>crtbeginS.o local crtBegin ;
local crtEnd ;
# TODO: use crtbeginS.o and crtendS.o unconditionally once we have
# switched to new compiler packages
if [ Glob $(HAIKU_GCC_LIB_DIR_$(architecture)) : crtbeginS.o ] {
crtBegin = <$(architecture)>crtbeginS.o ;
crtEnd = <$(architecture)>crtendS.o ;
} else {
crtBegin = <$(architecture)>crtbegin.o ;
crtEnd = <$(architecture)>crtend.o ;
}
HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = $(crtBegin)
<src!system!glue!$(architecture)>haiku_version_glue.o ; <src!system!glue!$(architecture)>haiku_version_glue.o ;
HAIKU_KERNEL_ADDON_END_GLUE_CODE HAIKU_KERNEL_ADDON_END_GLUE_CODE
= $(HAIKU_GCC_LIBGCC_$(architecture)) <$(architecture)>crtendS.o ; = $(HAIKU_GCC_LIBGCC_$(architecture)) $(crtEnd) ;
} }