Skip to content

Commit

Permalink
crossenv.mk: Empty MAKEFLAGS= variable when calling crossenv recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
th0ma7 committed Dec 1, 2024
1 parent 61f9213 commit 0fe7b1c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion mk/spksrc.crossenv.mk
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ ifneq ($(filter error-%, $(CROSSENV_BUILD_WHEEL)),)
@$(MAKE) $(CROSSENV_BUILD_WHEEL)
else
@$(MSG) $(MAKE) ARCH=$(firstword $(subst -, ,$*)) TCVERSION=$(lastword $(subst -, ,$*)) WHEEL=$(CROSSENV_BUILD_WHEEL) crossenv
@$(MAKE) ARCH=$(firstword $(subst -, ,$*)) TCVERSION=$(lastword $(subst -, ,$*)) WHEEL=$(CROSSENV_BUILD_WHEEL) crossenv
-@MAKEFLAGS= $(MAKE) ARCH=$(firstword $(subst -, ,$*)) TCVERSION=$(lastword $(subst -, ,$*)) WHEEL=$(CROSSENV_BUILD_WHEEL) crossenv
endif

####
Expand Down
2 changes: 1 addition & 1 deletion mk/spksrc.python-module.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CROSSENV_MODULE_PATH = $(firstword $(wildcard $(WORK_DIR)/crossenv-$(PKG_NAME)-$
### Prepare crossenv
build_crossenv_module:
@$(MSG) WHEEL="$(PKG_NAME)-$(PKG_VERS)" $(MAKE) crossenv-$(ARCH)-$(TCVERSION)
@WHEEL="$(PKG_NAME)-$(PKG_VERS)" $(MAKE) crossenv-$(ARCH)-$(TCVERSION)
-@MAKEFLAGS= WHEEL="$(PKG_NAME)-$(PKG_VERS)" $(MAKE) crossenv-$(ARCH)-$(TCVERSION)

### Python extension module rules
compile_python_module: build_crossenv_module
Expand Down
2 changes: 1 addition & 1 deletion mk/spksrc.wheel.mk
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ ifneq ($(strip $(WHEELS)),)
[ "$$(grep -s egg <<< $${wheel})" ] && name=$$(echo $${wheel#*egg=} | cut -f1 -d=) || name=$${wheel%%[<>=]=*} ; \
version=$$(echo $${requirement#*[<>=]=} | cut -f1 -d' ') ; \
$(MSG) "WHEEL=\"$${name}-$${version}\" $(MAKE) crossenv-$(ARCH)-$(TCVERSION)" ; \
WHEEL="$${name}-$${version}" $(MAKE) crossenv-$(ARCH)-$(TCVERSION) ; \
MAKEFLAGS= WHEEL="$${name}-$${version}" $(MAKE) crossenv-$(ARCH)-$(TCVERSION) ; \
for crossenv in $(WORK_DIR)/crossenv-$${name}-$${version} $(WORK_DIR)/crossenv-$${name} $(WORK_DIR)/crossenv ; do \
[ -d $${crossenv} ] && . $${crossenv}/build/python-cc.mk && break ; \
done ; \
Expand Down

0 comments on commit 0fe7b1c

Please sign in to comment.