github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 18:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Makefile: Pass SHELL to sub-make

Browse Source 
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 2022-03-11 13:24:56 -08:00
parent b4f7da1ec8
commit ebbc4716a7
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/root/Makefile
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
build/root/Makefile.generated_files
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 ?=