Skip to content

Commit

Permalink
chore(rules): Move makefile wrapper env hack to where publisher toolk…
Browse files Browse the repository at this point in the history
…its can use it
  • Loading branch information
alerque committed Jun 26, 2023
1 parent 8131675 commit e9e6ba8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 4 additions & 0 deletions rules/casile.mk.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ endif
# shell code it wants to execute. We use this one because the
.SHELLFLAGS += _WRAPTARGET=true

# Differentiate shells used to run recipies vs. shell wrapper function
# See https://stackoverflow.com/q/65553367/313192
_ENV := _WRAPTARGET=false

.SHELLFLAGS += $(eval @?=)$(and $@,target=$@)
.ONESHELL:
.SECONDEXPANSION:
Expand Down
4 changes: 0 additions & 4 deletions rules/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ LANGUAGE ?= en
# Empty recipes for anything we _don't_ want to bother rebuilding:
$(MAKEFILE_LIST):;

# Differentiate shells used to run recipies vs. shell wrapper function
# See https://stackoverflow.com/q/65553367/313192
_ENV := _WRAPTARGET=false

export PATH := $(CASILEDIR)/scripts:$(PATH):$(shell $(_ENV) $(PYTHON) -c "import site; print(site.getsitepackages()[0]+'/scripts')")
export HOSTNAME := $(shell $(_ENV) $(HOSTNAMEBIN))
export PROJECT := $(PROJECT)
Expand Down

0 comments on commit e9e6ba8

Please sign in to comment.