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

configure & build: make use of 64-bit libgcc and libsupc++ for EFI/x86_64

Browse Source 
Change-Id: I7636530d927843d155b9d7dada2db4f67c875290
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5139
Reviewed-by: Adrien Destugues <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
Reviewed-by: Jérôme Duval <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Jérôme Duval
2022-03-25 09:51:39 +00:00
parent 69b5103b54
commit 4df4b48fc6
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/SystemLibraryRules
+14 -6
View File
@@ -121,9 +121,13 @@ rule TargetBootLibsupc++ asPath
if $(TARGET_PLATFORM) = haiku {
if $(TARGET_PACKAGING_ARCH) = x86_64 {
# we need to use the 32-bit libsupc++.a built by the cross-compiler
return $(TARGET_BOOT_LIBSUPC++) ;
if $(TARGET_BOOT_PLATFORM) = efi {
# we need to use the 64-bit libsupc++.a built by the cross-compiler
return $(TARGET_BOOT_LIBSUPC++) ;
} else {
# we need to use the 32-bit libsupc++.a built by the cross-compiler
return $(TARGET_BOOT_32_LIBSUPC++) ;
}
# TODO: ideally, we would build this as part of gcc_syslibs_devel,
# but that isn't currently possible, as that would require
# 32-bit support (libraries and glue-code) on x86_64-Haiku.
@@ -239,9 +243,13 @@ rule TargetBootLibgcc architecture : asPath
if $(TARGET_PLATFORM) = haiku {
if $(architecture) = x86_64 {
# we need to use the 32-bit libgcc.a built by the cross-compiler
return $(TARGET_BOOT_LIBGCC) ;
if $(TARGET_BOOT_PLATFORM) = efi {
# we need to use the 64-bit libgcc.a built by the cross-compiler
return $(TARGET_BOOT_LIBGCC) ;
} else {
# we need to use the 32-bit libgcc.a built by the cross-compiler
return $(TARGET_BOOT_32_LIBGCC) ;
}
# TODO: ideally, we would build this as part of gcc_syslibs_devel,
# but that isn't currently possible, as that would require
# 32-bit support (libraries and glue-code) on x86_64-Haiku.