Remove libgnulib.a and use its sources in dependencies directly.

	This was the only instance of "library" in core config. A bug was
	reported that -fno-stack-protector wasn't passed to it. Instead of
	figuring out why it failed just remove this construction used
	needlessly.

diff --git a/ChangeLog b/ChangeLog
index b883d70bed9c4720b6ad6aba200c11b7e3af1a17..0d89f066cc8aec8f7171e6ca6d38f42d5e5ebe68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/Makefile.core.def: Remove libgnulib.a and use its
+       sources in dependencies directly.
+
+       This was the only instance of "library" in core config. A bug was
+       reported that -fno-stack-protector wasn't passed to it. Instead of
+       figuring out why it failed just remove this construction used
+       needlessly.
+
 2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/osdep/unix/password.c (grub_password_get): Check that

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 5cd84b1836e4378d3f1ee14b2f74a4901871ef37..80d9adb21a8a00f8b4a542557d544917f554a072 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -609,13 +609,6 @@ module = {
   common = commands/i386/nthibr.c;
 };
 
-library = {
-  name = libgnulib.a;
-  common = gnulib/regex.c;
-  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
-  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
-};
-
 module = {
   name = cmostest;
   common = commands/i386/cmostest.c;
@@ -667,8 +660,7 @@ module = {
   name = regexp;
   common = commands/regexp.c;
   common = commands/wildcard.c;
-  ldadd = libgnulib.a;
-  dependencies = libgnulib.a;
+  common = gnulib/regex.c;
   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
 };