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
This commit is contained in:
Tim Hockin committed 2022-03-11 14:51:38 -08:00
1 parent b4f7da1ec8
commit ebbc4716a7
2 files changed
+1 -4

No files matched your search

+1 -1
View File
@@ -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
-3
View File
@@ -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 ?=