diff options
| author | Nico Huber <nico.h@gmx.de> | 2017-08-14 01:38:24 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2017-08-15 14:22:51 +0000 |
| commit | a2ab1fd0ff6aa729bd52b71a5717fae7661ae638 (patch) | |
| tree | dcb2851dc6f9ba72ac6954e7c027fc51065e35a4 | |
| parent | 506bc8e2ff34565e5c50940d0ef3addb93b07faa (diff) | |
| download | coreboot-a2ab1fd0ff6aa729bd52b71a5717fae7661ae638.tar.xz | |
payloads/external/GRUB2: Sanitize Makefile
We were explicitly passing CC and TARGET_CC to configure but overwrote
that decision later by passing CC (with the value of TARGET_CC) directly
to a recursive make call. The latter overwrite was introduced because
`unexport` alone doesn't work on variables that were specified on a make
command line (they are added to MAKEOVERRIDES and passed to further re-
cursive make calls).
Instead of unexporting random variables, unexport those that were actu-
ally passed from payloads/external/Makefile.inc and clear MAKEOVERRIDES.
Do not pass OBJDUMP as that is nowhere to be found in the GRUB sources.
And, last but not least, add --disable-werror because building GRUB is
very susceptible to changes in the flex version.
Change-Id: Iaff2c72e89a5a540fe365eacb84811d5cff9d4d4
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/20990
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | payloads/external/GRUB2/Makefile | 29 | ||||
| -rw-r--r-- | payloads/external/Makefile.inc | 2 |
2 files changed, 9 insertions, 22 deletions
diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile index 7cac6a3219..dee7f6973b 100644 --- a/payloads/external/GRUB2/Makefile +++ b/payloads/external/GRUB2/Makefile @@ -6,21 +6,8 @@ NAME-$(CONFIG_GRUB2_REVISION)=$(CONFIG_GRUB2_REVISION_ID) project_git_repo=git://git.sv.gnu.org/grub.git project_dir=grub2 -unexport KCONFIG_AUTOCONFIG -unexport CFLAGS -unexport CPPFLAGS -unexport CCASFLAGS -unexport CC -unexport BUILD_CC -unexport TARGET_CC -unexport TARGET_CFLAGS -unexport TARGET_CPPFLAGS -unexport TARGET_STRIP -unexport TARGET_OBJCOPY -unexport HOST_CFLAGS -unexport HOST_CPPFLAGS -unexport HOST_CC - +unexport HOSTCC CC LD OBJCOPY STRIP +MAKEOVERRIDES := all: grub2 @@ -40,19 +27,19 @@ config: checkout rm -rf grub2/build mkdir grub2/build cd grub2 && ./autogen.sh - cd grub2/build && ../configure BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \ - TARGET_CC="$(CC)" \ - TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os --with-platform=coreboot \ - --enable-boot-time + cd grub2/build && ../configure CC="$(HOSTCC)" LD="$(LD)" \ + TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" \ + CFLAGS=-O2 TARGET_CFLAGS=-Os \ + --with-platform=coreboot --enable-boot-time --disable-werror grub2: config echo " MAKE GRUB2 $(NAME-y)" - $(MAKE) -C grub2/build CC="$(HOSTCC)" + $(MAKE) -C grub2/build $(MAKE) -C grub2/build default_payload.elf \ EXTRA_PAYLOAD_MODULES="$(CONFIG_GRUB2_EXTRA_MODULES)" clean: - test -d grub2 && $(MAKE) -C grub2 clean || exit 0 + test -f grub2/build/Makefile && $(MAKE) -C grub2/build clean || exit 0 distclean: rm -rf grub2 diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 344fe9fff6..fb50604c75 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -155,7 +155,7 @@ payloads/external/FILO/filo/build/version.h: filo grub2: $(MAKE) -C payloads/external/GRUB2 \ HOSTCC="$(HOSTCC)" \ - CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ + CC="$(CC_x86_32)" LD="$(LD_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER) \ CONFIG_GRUB2_REVISION=$(CONFIG_GRUB2_REVISION) \ |