From 66e35fb34132895ef1375268e19aa550af4e421b Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Wed, 21 Apr 2021 15:09:04 -0600 Subject: [PATCH] Makefile,tests: Move cmocka checkout into top level Makefile cmocka is currently ignoring the UPDATED_SUBMODULES flag. Move the cmocka checkout with the other submodule checkouts. BUG=none TEST=Make sure cmocka is not checked out if UPDATED_SUBMODULES=1 Signed-off-by: Raul E Rangel Change-Id: I2a1db809368a77d2c0f9c9a796d62555ec476dc7 Reviewed-on: https://review.coreboot.org/c/coreboot/+/52578 Tested-by: build bot (Jenkins) Reviewed-by: Jakub Czapiga --- Makefile.inc | 2 ++ tests/Makefile.inc | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index a372efaedc..ce70a30c0f 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -193,6 +193,8 @@ endif ifneq ($(UPDATED_SUBMODULES),1) # try to fetch non-optional submodules if the source is under git forgetthis:=$(if $(GIT),$(shell git submodule update --init)) +# Checkout Cmocka repository +forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/cmocka)) ifeq ($(CONFIG_USE_BLOBS),y) # These items are necessary because each has update=none in .gitmodules. They are ignored # until expressly requested and enabled with --checkout diff --git a/tests/Makefile.inc b/tests/Makefile.inc index 48bd18b2ba..fd3cd9f8d1 100644 --- a/tests/Makefile.inc +++ b/tests/Makefile.inc @@ -41,9 +41,6 @@ TEST_CFLAGS += -std=gnu11 -Os -ffunction-sections -fdata-sections -fno-builtin TEST_CFLAGS += -D__TEST__ -# Checkout Cmocka repository -forgetthis:=$(shell git submodule update --init --checkout 3rdparty/cmocka) - TEST_CFLAGS += -I$(cmockasrc)/include # Link against Cmocka