From bec6c56a362783ac2f9312e35b3094f151cb0c4b Mon Sep 17 00:00:00 2001 From: mintsuki Date: Thu, 28 Sep 2023 06:06:05 -0500 Subject: [PATCH] build: Fix race conditions introduced in 22d45a54283d7f58f3ed7452278005baf6323f53 --- common/GNUmakefile | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/common/GNUmakefile b/common/GNUmakefile index bca726221..7b1d5647f 100644 --- a/common/GNUmakefile +++ b/common/GNUmakefile @@ -343,7 +343,12 @@ $(call MKESCAPE,$(BUILDDIR))/BOOTX64.EFI: $(call MKESCAPE,$(BUILDDIR))/limine.el $(OBJCOPY_FOR_TARGET) -O binary '$(call SHESCAPE,$<)' '$(call SHESCAPE,$@)' chmod -x '$(call SHESCAPE,$@)' -$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_x86_64.c.o: $(call MKESCAPE,$(BUILDDIR))/limine-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.S.o: limine-efi + +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_x86_64.c.o: limine-efi + +.PHONY: limine-efi +limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi $(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \ CC="$(CC_FOR_TARGET)" \ CFLAGS="$(BASE_CFLAGS)" \ @@ -384,7 +389,12 @@ $(call MKESCAPE,$(BUILDDIR))/BOOTAA64.EFI: $(call MKESCAPE,$(BUILDDIR))/limine.e $(OBJCOPY_FOR_TARGET) -O binary '$(call SHESCAPE,$<)' '$(call SHESCAPE,$@)' chmod -x '$(call SHESCAPE,$@)' -$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-aarch64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_aarch64.c.o: $(call MKESCAPE,$(BUILDDIR))/limine-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-aarch64.S.o: limine-efi + +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_aarch64.c.o: limine-efi + +.PHONY: limine-efi +limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi $(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \ CC="$(CC_FOR_TARGET)" \ CFLAGS="$(BASE_CFLAGS)" \ @@ -424,7 +434,12 @@ $(call MKESCAPE,$(BUILDDIR))/BOOTRISCV64.EFI: $(call MKESCAPE,$(BUILDDIR))/limin $(OBJCOPY_FOR_TARGET) -O binary '$(call SHESCAPE,$<)' '$(call SHESCAPE,$@)' chmod -x '$(call SHESCAPE,$@)' -$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-riscv64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_riscv64.c.o: $(call MKESCAPE,$(BUILDDIR))/limine-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-riscv64.S.o: limine-efi + +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_riscv64.c.o: limine-efi + +.PHONY: limine-efi +limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi $(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \ CC="$(CC_FOR_TARGET)" \ CFLAGS="$(BASE_CFLAGS)" \ @@ -464,7 +479,12 @@ $(call MKESCAPE,$(BUILDDIR))/BOOTIA32.EFI: $(call MKESCAPE,$(BUILDDIR))/limine.e $(OBJCOPY_FOR_TARGET) -O binary '$(call SHESCAPE,$<)' '$(call SHESCAPE,$@)' chmod -x '$(call SHESCAPE,$@)' -$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_ia32.c.o: $(call MKESCAPE,$(BUILDDIR))/limine-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.S.o: limine-efi + +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_ia32.c.o: limine-efi + +.PHONY: limine-efi +limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi $(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \ CC="$(CC_FOR_TARGET)" \ CFLAGS="$(BASE_CFLAGS)" \