Fix compilation of EFI programs

This commit is contained in:
Jeremy Soller 2019-09-07 20:00:50 -06:00
parent ddbdc5a5d1
commit ad6e8428ae
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1

View file

@ -19,6 +19,7 @@ build/livedisk.iso: build/livedisk.bin.gz
isohybrid $@ isohybrid $@
bootloader-coreboot/build/bootloader: build/kernel_coreboot bootloader-coreboot/build/bootloader: build/kernel_coreboot
env --unset=RUST_TARGET_PATH --unset=RUSTUP_TOOLCHAIN --unset=XARGO_RUST_SRC \
$(MAKE) -C bootloader-coreboot clean build/bootloader KERNEL="$(ROOT)/$<" $(MAKE) -C bootloader-coreboot clean build/bootloader KERNEL="$(ROOT)/$<"
build/coreboot.elf: bootloader-coreboot/build/bootloader build/coreboot.elf: bootloader-coreboot/build/bootloader
@ -26,8 +27,8 @@ build/coreboot.elf: bootloader-coreboot/build/bootloader
cp -v $< $@ cp -v $< $@
bootloader-efi/build/$(EFI_TARGET)/boot.efi: FORCE bootloader-efi/build/$(EFI_TARGET)/boot.efi: FORCE
cd bootloader-efi && \ env --unset=RUST_TARGET_PATH --unset=RUSTUP_TOOLCHAIN --unset=XARGO_RUST_SRC \
$(MAKE) build/$(EFI_TARGET)/boot.efi TARGET=$(EFI_TARGET) $(MAKE) -C bootloader-efi build/$(EFI_TARGET)/boot.efi TARGET=$(EFI_TARGET)
build/bootloader.efi: bootloader-efi/build/$(EFI_TARGET)/boot.efi build/bootloader.efi: bootloader-efi/build/$(EFI_TARGET)/boot.efi
mkdir -p build mkdir -p build