github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108661 from thockin/makefile-pass-SHELL

Browse Source 
Makefile: Pass SHELL to sub-make
This commit is contained in:
Kubernetes Prow Robot 2022-03-11 20:30:34 -08:00 committed by GitHub
commit 45f2c63d6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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" echo "$$GENERATED_FILES_HELP_INFO"
else else
generated_files gen_openapi: 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 endif
define HELP_INFO define HELP_INFO

3
build/root/Makefile.generated_files
View File

@ -33,9 +33,6 @@ ifeq ($(DBG_MAKEFILE),1)
endif 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. # Define variables so `make --warn-undefined-variables` works.
DBG_CODEGEN ?= DBG_CODEGEN ?=
UPDATE_API_KNOWN_VIOLATIONS ?= UPDATE_API_KNOWN_VIOLATIONS ?=