Its been a while since I've compiled grub using the latest git.  When I
just did, the build now fails in configure when evaluating the efiemu
link format test (which was being automatically chosen by efiemu
option being guessed to "yes"). The proximate issue was that the test
program failed to compile due to a missing include directory (which may
be the result of a packaging issue on my machine).

Whereas when compiling for the emu platform the efiemu allows for the
CFLAGS to be affected by the TARGET_CFLAGS environment variable, there
is no equivalent method to affect the CFLAGS of the test for i386
platforms.  So I added TARGET_CFLAGS (and TARGET_LDFLAGS) for symmetry
with the emu platform.

The attached patch allowed me to successfully compile with efiemu
(untested since I don't actually use efiemu).  Perhaps it will be of
use to others.

Glenn

diff --git a/configure.ac b/configure.ac
index 8888c2f..1a8c341 100644
--- a/configure.ac
+++ b/configure.ac
@@ -718,7 +718,7 @@ if test x"$platform" = xefi ; then
 fi
 if test x"$efiemu_excuse" = x ; then
   AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
-    CFLAGS="-m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
+    CFLAGS="$TARGET_CFLAGS -m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 		      [grub_cv_cc_efiemu=yes],
 		      [grub_cv_cc_efiemu=no])
@@ -731,8 +731,8 @@ if test x"$efiemu_excuse" = x ; then
   AC_CACHE_CHECK([for efiemu64 linking format], [grub_cv_target_cc_efiemu64_link_format], [
     grub_cv_target_cc_efiemu64_link_format=unknown
     for format in -melf_x86_64 -melf_x86_64_fbsd -melf_x86_64_obsd -melf_x86_64_haiku -arch,x86_64; do
-      CFLAGS="-m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
-      LDFLAGS="-m64 -Wl,$format -nostdlib -static"
+      CFLAGS="$TARGET_CFLAGS -m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
+      LDFLAGS="$TARGET_LDFLAGS -m64 -Wl,$format -nostdlib -static"
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[
       asm (".globl start; start:");
       asm (".globl _start; _start:");
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to