ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move log directory creation above the make version check (issue #375)

Browse Source
This commit is contained in:
Trammell hudson 2018-04-19 19:37:45 -04:00
parent ee9bb29c7d
commit a91be6b38d
Failed to extract signature
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -9,12 +9,20 @@ config := $(pwd)/config
INSTALL := $(pwd)/install INSTALL := $(pwd)/install
log_dir := $(build)/log log_dir := $(build)/log
# Controls how many parallel jobs are invoked in subshells
CPUS := $(shell nproc)
#MAKE_JOBS ?= -j$(CPUS) --max-load 16
# Create the log directory if it doesn't already exist
BUILD_LOG := $(shell mkdir -p "$(log_dir)" "$(build)/$(BOARD)" )
# Check that we have a correct version of make # Check that we have a correct version of make
LOCAL_MAKE_VERSION := $(shell $(MAKE) --version | head -1 | cut -d' ' -f3) LOCAL_MAKE_VERSION := $(shell $(MAKE) --version | head -1 | cut -d' ' -f3)
include modules/make include modules/make
ifeq "$(LOCAL_MAKE_VERSION)" "$(make_version)" ifeq "$(LOCAL_MAKE_VERSION)" "$(make_version)"
# This is the correct version of Make
BOARD ?= qemu-coreboot BOARD ?= qemu-coreboot
CONFIG := $(pwd)/boards/$(BOARD)/$(BOARD).config CONFIG := $(pwd)/boards/$(BOARD)/$(BOARD).config
@ -28,13 +36,6 @@ include $(CONFIG)
# Unless otherwise specified, we are building for heads # Unless otherwise specified, we are building for heads
CONFIG_HEADS ?= y CONFIG_HEADS ?= y
# Controls how many parallel jobs are invoked in subshells
CPUS := $(shell nproc)
#MAKE_JOBS ?= -j$(CPUS) --max-load 16
# Create the log directory if it doesn't already exist
BUILD_LOG := $(shell mkdir -p "$(log_dir)" "$(build)/$(BOARD)" )
# Some things want usernames, we use the current checkout # Some things want usernames, we use the current checkout
# so that they are reproducible # so that they are reproducible
GIT_HASH := $(shell git rev-parse HEAD) GIT_HASH := $(shell git rev-parse HEAD)
@ -510,7 +511,7 @@ HEADS_MAKE := $(build)/$(make_dir)/make
# Once we have a proper Make, we can just pass arguments into it # Once we have a proper Make, we can just pass arguments into it
all bootstrap linux cpio: $(HEADS_MAKE) all bootstrap linux cpio: $(HEADS_MAKE)
LANG=C MAKE=$(HEADS_MAKE) $(HEADS_MAKE) $@ LANG=C MAKE=$(HEADS_MAKE) $(HEADS_MAKE) $(MAKE_JOBS) $@
%.clean %.intermediate %.vol: $(HEADS_MAKE) %.clean %.intermediate %.vol: $(HEADS_MAKE)
LANG=C MAKE=$(HEADS_MAKE) $(HEADS_MAKE) $@ LANG=C MAKE=$(HEADS_MAKE) $(HEADS_MAKE) $@