efi: Drop x86_64 assumptions.

Change-Id: I3d806f43ef951013369fd0bf906eca5977e8d34c
This commit is contained in:
Alexander von Gluck IV
2018-08-08 10:18:06 -05:00
parent a0f7292802
commit 3718fb861d
2 changed files with 12 additions and 14 deletions
+11 -13
View File
@@ -693,20 +693,18 @@ if [ IsPackageAvailable expat_devel ] {
# gnu-efi # gnu-efi
if $(TARGET_PACKAGING_ARCH) = x86_64 { if [ IsPackageAvailable gnu_efi_kernel ] {
if [ IsPackageAvailable gnu_efi_kernel ] { ExtractBuildFeatureArchives gnuefi :
ExtractBuildFeatureArchives gnuefi : file: base gnu_efi_kernel
file: base gnu_efi_kernel headers: develop/headers/gnuefi
headers: develop/headers/gnuefi headersProtocol: develop/headers/gnuefi/protocol
headersProtocol: develop/headers/gnuefi/protocol headersArch: develop/headers/gnuefi/$(TARGET_ARCH)
headersArch: develop/headers/gnuefi/$(TARGET_ARCH) libdir: develop/lib/gnuefi
libdir: develop/lib/gnuefi ;
;
EnableBuildFeatures gnuefi ; EnableBuildFeatures gnuefi ;
} else { } else {
Echo "gnu_efi_kernel support not available on $(TARGET_PACKAGING_ARCH)" ; Echo "gnu_efi_kernel support not available on $(TARGET_PACKAGING_ARCH)" ;
}
} }
+1 -1
View File
@@ -16,7 +16,7 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ;
} }
local efi_glue_src = local efi_glue_src =
crt0-efi-x86_64.S crt0-efi-$(TARGET_ARCH).S
; ;
local platform_src = local platform_src =