Index: aclocal.m4
===================================================================
--- aclocal.m4	(revision 1933)
+++ aclocal.m4	(working copy)
@@ -112,7 +112,7 @@
 AC_MSG_RESULT([$grub_cv_prog_ld_build_id_none])
 
 if test "x$grub_cv_prog_ld_build_id_none" = xyes; then
-  MODULE_LDFLAGS="$MODULE_LDFLAGS -Wl,--build-id=none"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,--build-id=none"
 fi
 ])
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 1933)
+++ ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-12-04  Manoel R. Abranches <address@hidden>
+		
+	Add --build-id=none to all ld calls instead of only the ones related
+	to modules. This correct a problem with grub-mkelfimage.
+	* aclocal.m4: Move --build-id=none from MODULE_LDFLAGS to
+	TARGET_LDFLAGS
+
 2008-11-29  Robert Millan  <address@hidden>
 
 	* disk/ata.c (grub_ata_pciinit): Handle errors rised by