diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2021-04-13 15:48:38 +0200 |
|---|---|---|
| committer | Paul Fagerburg <pfagerburg@chromium.org> | 2022-01-14 00:30:04 +0000 |
| commit | ca6e5ee59433f553500dbd3ea2e7ddc86bfed77f (patch) | |
| tree | a39f72ad63a4f53ecbc804468806605088cb658b | |
| parent | 62afdb675a49bfebbdd4f186f696c15a56d64348 (diff) | |
| download | coreboot-ca6e5ee59433f553500dbd3ea2e7ddc86bfed77f.tar.gz coreboot-ca6e5ee59433f553500dbd3ea2e7ddc86bfed77f.tar.bz2 coreboot-ca6e5ee59433f553500dbd3ea2e7ddc86bfed77f.zip | |
Makefile: Defer normalizing configuration for reproducible builds
The call to genbuild_h needs to happen after xcompile is imported so
that genbuid_h can use iasl as chosen by xcompile. Move the entire
section down to keep things together.
TEST=no more error that util/crossgcc/xgcc/bin/iasl isn't found.
Change-Id: Ia7afd32bd120e5405e65825144b0c30d69931a22
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52292
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
| -rw-r--r-- | Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -20,17 +20,6 @@ VBOOT_HOST_BUILD ?= $(abspath $(objutil)/vboot_lib) COREBOOT_EXPORTS := COREBOOT_EXPORTS COREBOOT_EXPORTS += top src srck obj objutil objk -# reproducible builds -LANG:=C -LC_ALL:=C -TZ:=UTC0 -ifneq ($(NOCOMPILE),1) -SOURCE_DATE_EPOCH := $(shell $(top)/util/genbuild_h/genbuild_h.sh . | sed -n 's/^.define COREBOOT_BUILD_EPOCH\>.*"\(.*\)".*/\1/p') -endif -# don't use COREBOOT_EXPORTS to ensure build steps outside the coreboot build system -# are reproducible -export LANG LC_ALL TZ SOURCE_DATE_EPOCH - DOTCONFIG ?= $(top)/.config KCONFIG_CONFIG = $(DOTCONFIG) KCONFIG_AUTOADS := $(obj)/cb-config.ads @@ -176,6 +165,17 @@ $(error $(xcompile) deleted because it's invalid. \ Restarting the build should fix that, or explain the problem) endif +# reproducible builds +LANG:=C +LC_ALL:=C +TZ:=UTC0 +ifneq ($(NOCOMPILE),1) +SOURCE_DATE_EPOCH := $(shell $(top)/util/genbuild_h/genbuild_h.sh . | sed -n 's/^.define COREBOOT_BUILD_EPOCH\>.*"\(.*\)".*/\1/p') +endif +# don't use COREBOOT_EXPORTS to ensure build steps outside the coreboot build system +# are reproducible +export LANG LC_ALL TZ SOURCE_DATE_EPOCH + ifneq ($(CONFIG_MMX),y) CFLAGS_x86_32 += -mno-mmx endif |