From ebbc4716a7a4b7d8a2c46ff8d08f9b201e7ab535 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Fri, 11 Mar 2022 13:24:56 -0800 Subject: [PATCH] Makefile: Pass SHELL to sub-make It turns out that: a) SHELL does not automatically get passed down b) we were resetiing SHELL in the sub-make anyway --- build/root/Makefile | 2 +- build/root/Makefile.generated_files | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build/root/Makefile b/build/root/Makefile index 754e824bab8..fd87100b104 100644 --- a/build/root/Makefile +++ b/build/root/Makefile @@ -525,7 +525,7 @@ generated_files: echo "$$GENERATED_FILES_HELP_INFO" else generated_files gen_openapi: - $(MAKE) -f Makefile.generated_files $@ CALLED_FROM_MAIN_MAKEFILE=1 + $(MAKE) -f Makefile.generated_files $@ CALLED_FROM_MAIN_MAKEFILE=1 SHELL="$(SHELL)" endif define HELP_INFO diff --git a/build/root/Makefile.generated_files b/build/root/Makefile.generated_files index 13e4095dfef..a7d3a6b8098 100644 --- a/build/root/Makefile.generated_files +++ b/build/root/Makefile.generated_files @@ -33,9 +33,6 @@ ifeq ($(DBG_MAKEFILE),1) endif -# It's necessary to set this because some environments don't link sh -> bash. -SHELL := /usr/bin/env bash - # Define variables so `make --warn-undefined-variables` works. DBG_CODEGEN ?= UPDATE_API_KNOWN_VIOLATIONS ?=