grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v1] readd build dependency for startup_raw.S


From: Olaf Hering
Subject: [PATCH v1] readd build dependency for startup_raw.S
Date: Wed, 16 Aug 2023 11:55:01 +0200

startup_raw.S includes a generated file, and used to have a dependency
in the Makefile to make sure the generated file exists prior
compilation. This dependency was removed, and as a result building
startup_raw.S randomly fails:

../../20230814T181249.4fdcb339b/grub-core/boot/i386/pc/startup_raw.S:129:10: 
fatal error: rs_decoder.h: No such file or directory
  129 | #include <rs_decoder.h>
      |          ^~~~~~~~~~~~~~
compilation terminated.
make: *** [Makefile:34654: boot/i386/pc/lzma_decompress_image-startup_raw.o] 
Error 1

Fixes cc2841129652 ("Fix make dist on non-pc.")

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---

The referenced commit removed also a dependency for mips.
I can not test mips, so I left mips as it is.

 grub-core/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index f0cb2f2cc..a5020c432 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -62,6 +62,8 @@ grub_script.yy.c: grub_script.yy.h
 rs_decoder.h: $(srcdir)/lib/reed_solomon.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) 
-S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding
 
+boot/i386/pc/startup_raw.S: $(builddir)/rs_decoder.h
+
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
 include $(srcdir)/Makefile.core.am




reply via email to

[Prev in Thread] Current Thread [Next in Thread]