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

link bootloader with libgcc-boot.a and libsupc++-boot.a on ARM

Browse Source 
Change-Id: Ia7f41191136db3ea34ed6abee97ae627bb7b1727
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4703
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
David Karoly
2021-12-11 14:07:06 +00:00
committed by Adrien Destugues
parent 123aa1325c
commit 69f4a74149
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+3
View File
@@ -78,9 +78,12 @@ if [ IsPackageAvailable gcc_syslibs_devel ] {
libgcc_eh.a: $(developLibDir)/libgcc_eh.a libgcc_eh.a: $(developLibDir)/libgcc_eh.a
libgcc-kernel.a: $(developLibDir)/libgcc-kernel.a libgcc-kernel.a: $(developLibDir)/libgcc-kernel.a
libgcc_eh-kernel.a: $(developLibDir)/libgcc_eh.a libgcc_eh-kernel.a: $(developLibDir)/libgcc_eh.a
libgcc-boot.a: $(developLibDir)/libgcc-boot.a
libgcc_eh-boot.a: $(developLibDir)/libgcc_eh-boot.a
libstdc++.a: $(developLibDir)/libstdc++.a libstdc++.a: $(developLibDir)/libstdc++.a
libsupc++.a: $(developLibDir)/libsupc++.a libsupc++.a: $(developLibDir)/libsupc++.a
libsupc++-kernel.a: $(developLibDir)/libsupc++-kernel.a libsupc++-kernel.a: $(developLibDir)/libsupc++-kernel.a
libsupc++-boot.a: $(developLibDir)/libsupc++-boot.a
c++-headers: $(developHeadersDir)/c++ c++-headers: $(developHeadersDir)/c++
gcc-headers: $(developHeadersDir)/gcc gcc-headers: $(developHeadersDir)/gcc
; ;
build/jam/SystemLibraryRules
+12
View File
@@ -134,6 +134,12 @@ rule TargetBootLibsupc++ asPath
if $(asPath) = true { if $(asPath) = true {
flags += path ; flags += path ;
} }
if $(TARGET_PACKAGING_ARCH) = arm {
return [
BuildFeatureAttribute gcc_syslibs_devel
: libsupc++-boot.a : $(flags)
] ;
}
return [ return [
BuildFeatureAttribute gcc_syslibs_devel BuildFeatureAttribute gcc_syslibs_devel
: libsupc++-kernel.a : $(flags) : libsupc++-kernel.a : $(flags)
@@ -246,6 +252,12 @@ rule TargetBootLibgcc architecture : asPath
if $(asPath) = true { if $(asPath) = true {
flags += path ; flags += path ;
} }
if $(architecture) = arm {
return [
BuildFeatureAttribute QUALIFIED $(architecture):gcc_syslibs_devel
: libgcc-boot.a : $(flags)
] ;
}
return [ return [
BuildFeatureAttribute QUALIFIED $(architecture):gcc_syslibs_devel BuildFeatureAttribute QUALIFIED $(architecture):gcc_syslibs_devel
: libgcc-kernel.a : $(flags) : libgcc-kernel.a : $(flags)