| From fc05ced797b87286b8ec7303fe32bf200a072972 Mon Sep 17 00:00:00 2001 |
| From: Esben Haabendal <esben@haabendal.dk> |
| Date: Mon, 18 Mar 2019 11:14:31 +0100 |
| Subject: [PATCH] Fix linking for non-host compatible targets |
| |
| Without this, gummiboot build system will use host 'ld' when linking |
| target binary, which is obviously not a good idea. |
| |
| Signed-off-by: Esben Haabendal <esben@haabendal.dk> |
| --- |
| Makefile.am | 4 ++-- |
| configure.ac | 4 ++++ |
| 2 files changed, 6 insertions(+), 2 deletions(-) |
| |
| diff --git a/Makefile.am b/Makefile.am |
| index 6568a355ed74..9051dd44edd9 100644 |
| --- a/Makefile.am |
| +++ b/Makefile.am |
| @@ -142,7 +142,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) |
| $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ |
| |
| $(gummiboot_solib): $(gummiboot_objects) |
| - $(AM_V_CCLD)$(LD) $(efi_ldflags) $(gummiboot_objects) \ |
| + $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(gummiboot_objects) \ |
| -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ |
| nm -D -u $@ | grep ' U ' && exit 1 || : |
| .DELETE_ON_ERROR: $(gummboot_solib) |
| @@ -177,7 +177,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) |
| $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ |
| |
| $(stub_solib): $(stub_objects) |
| - $(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \ |
| + $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(stub_objects) \ |
| -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ |
| nm -D -u $@ | grep ' U ' && exit 1 || : |
| .DELETE_ON_ERROR: $(gummboot_solib) |
| diff --git a/configure.ac b/configure.ac |
| index 27bbe1d73396..b948696c220b 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -40,6 +40,10 @@ dnl Don't try to use things like -std=c99 for efi compilation |
| EFI_CC=$CC |
| AC_SUBST([EFI_CC]) |
| |
| +dnl Allow specifying linker compatible with the compiler |
| +EFI_LD=$LD |
| +AC_SUBST([EFI_LD]) |
| + |
| AC_PROG_CC_C99 |
| AM_PROG_CC_C_O |
| AC_PROG_GCC_TRADITIONAL |
| -- |
| 2.21.0 |
| |
