|
 |
4c0d37 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
4c0d37 |
From: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
Date: Wed, 13 Nov 2019 15:24:27 -0500
|
|
|
4c0d37 |
Subject: [PATCH] Rename our installed .o and linker scripts.
|
|
|
4c0d37 |
|
|
|
4c0d37 |
Since crt0 and our linker scripts are now in a subdirectory, there's no
|
|
|
4c0d37 |
need to make them named differently in the installed machine. This
|
|
|
4c0d37 |
renames them to crt0.o and efi.lds .
|
|
|
4c0d37 |
|
|
|
4c0d37 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
---
|
|
|
4c0d37 |
gnuefi/Makefile | 18 +++++++++---------
|
|
|
4c0d37 |
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
diff --git a/gnuefi/Makefile b/gnuefi/Makefile
|
|
|
4c0d37 |
index 7652669a7cc..86760f55578 100644
|
|
|
4c0d37 |
--- a/gnuefi/Makefile
|
|
|
4c0d37 |
+++ b/gnuefi/Makefile
|
|
|
4c0d37 |
@@ -55,35 +55,35 @@ all: $(TARGETS)
|
|
|
4c0d37 |
libgnuefi.a: $(OBJS)
|
|
|
4c0d37 |
$(AR) $(ARFLAGS) $@ $^
|
|
|
4c0d37 |
|
|
|
4c0d37 |
-
|
|
|
4c0d37 |
clean:
|
|
|
4c0d37 |
@rm -vf $(TARGETS) *~ *.o $(OBJS)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
install:
|
|
|
4c0d37 |
- mkdir -p $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)
|
|
|
4c0d37 |
- $(INSTALL) -m 644 -t $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/ $(TARGETS)
|
|
|
4c0d37 |
+ @mkdir -p $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)
|
|
|
4c0d37 |
+ @$(INSTALL) -v -m 644 -t $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) libgnuefi.a
|
|
|
4c0d37 |
+ @$(INSTALL) -v -m 644 crt0-efi-$(ARCH).o $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/crt0.o
|
|
|
4c0d37 |
ifneq (,$(findstring FreeBSD,$(OS)))
|
|
|
4c0d37 |
ifeq ($(ARCH),x64)
|
|
|
4c0d37 |
- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)
|
|
|
4c0d37 |
+ @$(INSTALL) -v -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)
|
|
|
4c0d37 |
else
|
|
|
4c0d37 |
- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)
|
|
|
4c0d37 |
+ @$(INSTALL) -v -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/efi.lds
|
|
|
4c0d37 |
endif
|
|
|
4c0d37 |
else
|
|
|
4c0d37 |
- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)
|
|
|
4c0d37 |
+ @$(INSTALL) -v -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/efi.lds
|
|
|
4c0d37 |
endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
install_compat: install
|
|
|
4c0d37 |
mkdir -p $(INSTALLROOT)$(LIBDIR)
|
|
|
4c0d37 |
$(SYMLINK) gnuefi/$(ARCH)/libgnuefi.a $(INSTALLROOT)$(LIBDIR)/libgnuefi.a
|
|
|
4c0d37 |
- $(SYMLINK) gnuefi/$(ARCH)/crt0-efi-$(ARCH).o $(INSTALLROOT)$(LIBDIR)/crt0-efi-$(BFD_ARCH).o
|
|
|
4c0d37 |
+ $(SYMLINK) gnuefi/$(ARCH)/crt0.o $(INSTALLROOT)$(LIBDIR)/crt0-efi-$(BFD_ARCH).o
|
|
|
4c0d37 |
ifneq (,$(findstring FreeBSD,$(OS)))
|
|
|
4c0d37 |
ifeq ($(ARCH),x64)
|
|
|
4c0d37 |
$(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_fbsd_efi.lds
|
|
|
4c0d37 |
else
|
|
|
4c0d37 |
- $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds
|
|
|
4c0d37 |
+ $(SYMLINK) gnuefi/$(ARCH)/efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds
|
|
|
4c0d37 |
endif
|
|
|
4c0d37 |
else
|
|
|
4c0d37 |
- $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds
|
|
|
4c0d37 |
+ $(SYMLINK) gnuefi/$(ARCH)/efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds
|
|
|
4c0d37 |
endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
include $(SRCDIR)/../Make.rules
|