From 469021b4b3f93e74b92cc3ef152c3f0723c366b1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 29 Nov 2013 03:36:50 +0100 Subject: [PATCH] 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. --- ChangeLog | 10 ++++++++++ grub-core/Makefile.core.def | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b883d70be..0d89f066c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2013-11-29 Vladimir Serbinenko + + * 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 * 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 5cd84b183..80d9adb21 100644 --- 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)'; };