:: commit ac090a298c1e2e89cad56e7af0643c4b0dcfc0ae

mintsuki <mintsuki@protonmail.com> — 2022-02-21 12:08

parents: 06ec047210

build: Misc gnu-efi related fixes

diff --git a/common/GNUmakefile b/common/GNUmakefile
index 4441e04a..14d7648d 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -283,12 +283,16 @@ $(call MKESCAPE,$(BUILDDIR))/BOOTX64.EFI: $(call MKESCAPE,$(BUILDDIR))/limine.el
 	$(LIMINE_OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel -j .rela -j .rel.* -j .rela.* -j .reloc -j .sbat --target efi-app-x86_64 '$(call SHESCAPE,$<)' '$(call SHESCAPE,$@)'
 
 $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/crt0-efi-x86_64.o: reduced-gnu-efi
+	true
+
 $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/libgnuefi.a: reduced-gnu-efi
+	true
 
 .PHONY: reduced-gnu-efi
 reduced-gnu-efi: $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi
 	unset ARFLAGS; unset ASFLAGS; unset LDFLAGS; unset CFLAGS; unset CPPFLAGS; \
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi' \
+		HOSTCC="$(CC)" \
 		CC="$(LIMINE_CC) -m64 -march=x86-64 -mtune=generic" \
 		LD="$(LIMINE_LD)" \
 		AR="$(LIMINE_AR)" \
@@ -328,12 +332,16 @@ $(call MKESCAPE,$(BUILDDIR))/BOOTIA32.EFI: $(call MKESCAPE,$(BUILDDIR))/limine.e
 	$(LIMINE_OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel -j .rela -j .rel.* -j .rela.* -j .reloc -j .sbat --target efi-app-ia32 '$(call SHESCAPE,$<)' '$(call SHESCAPE,$@)'
 
 $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/crt0-efi-ia32.o: reduced-gnu-efi
+	true
+
 $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/libgnuefi.a: reduced-gnu-efi
+	true
 
 .PHONY: reduced-gnu-efi
 reduced-gnu-efi: $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi
 	unset ARFLAGS; unset ASFLAGS; unset LDFLAGS; unset CFLAGS; unset CPPFLAGS; \
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi' \
+		HOSTCC="$(CC)" \
 		CC="$(LIMINE_CC) -m32 -march=i686 -mtune=generic" \
 		LD="$(LIMINE_LD)" \
 		AR="$(LIMINE_AR)" \
tab: 248 wrap: offon