[haiku-commits] BRANCH tqh-github.efi [82c0f90] in src/system: ldscripts/x86_64 boot/platform/efi
- From: tqh-github.efi <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 7 Sep 2013 15:00:32 +0200 (CEST)
added 1 changeset to branch 'refs/remotes/tqh-github/efi'
old head: 90d9a253af4e6d0af2fe083cbeba02ca46ee661f
new head: 82c0f90e7b2d2b99e4e461e994d39af36fb4fa33
overview: https://github.com/tqh/haiku/compare/90d9a25...82c0f90
----------------------------------------------------------------------------
82c0f90: Use boot_loader_$(TARGET_BOOT_PLATFORM).ld naming for linker script.
As dictated in system/boot/Jamfile.
[ Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx> ]
----------------------------------------------------------------------------
Commit: 82c0f90e7b2d2b99e4e461e994d39af36fb4fa33
Author: Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>
Date: Sat Sep 7 12:48:04 2013 UTC
----------------------------------------------------------------------------
2 files changed, 1 insertion(+), 3 deletions(-)
src/system/boot/platform/efi/Jamfile | 4 +---
src/system/ldscripts/x86_64/{efi.ld => boot_loader_efi.ld} | 0
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/efi/Jamfile
b/src/system/boot/platform/efi/Jamfile
index 45cef95..143f048 100644
--- a/src/system/boot/platform/efi/Jamfile
+++ b/src/system/boot/platform/efi/Jamfile
@@ -24,7 +24,7 @@ BootMergeObject boot_platform_efi.o :
BootLd haiku_efi_bootloader.so
: boot_platform_efi.o
- : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/efi.ld
+ : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/boot_loader_efi.ld
: -Bsymbolic -shared -nostdlib -znocombreloc ;
@@ -44,6 +44,4 @@ actions EFIApplication {
EFIApplication haiku.efi : haiku_efi_bootloader.so ;
-#SEARCH on [ FGristFiles $(efi_boot_src) ] = [ FDirName $(HAIKU_TOP) src
system boot platform efi ] ;
SEARCH on [ FGristFiles $(efi_glue_src) ] = [ FDirName $(HAIKU_TOP) src
system boot platform efi arch $(TARGET_ARCH) ] ;
-SEARCH on [ FGristFiles $(genericPlatformSources) ] = [ FDirName $(HAIKU_TOP)
src system boot platform generic ] ;
diff --git a/src/system/ldscripts/x86_64/efi.ld
b/src/system/ldscripts/x86_64/boot_loader_efi.ld
similarity index 100%
rename from src/system/ldscripts/x86_64/efi.ld
rename to src/system/ldscripts/x86_64/boot_loader_efi.ld
Other related posts:
- » [haiku-commits] BRANCH tqh-github.efi [82c0f90] in src/system: ldscripts/x86_64 boot/platform/efi - tqh-github . efi
