suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Use $$(OBJ) consistently in rules macros.

Browse source
This commit is contained in:
Rémi Bernon 2021-06-02 15:26:20 +02:00 committed by Arkadiusz Hiler
parent 6d682e4b17
commit 808b99bd27
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
make/rules-cargo.mk
View file

@ -7,11 +7,11 @@ define create-rules-cargo
$(call create-rules-common,$(1),$(2),$(3)) $(call create-rules-common,$(1),$(2),$(3))
ifeq ($(CONTAINER),1) ifeq ($(CONTAINER),1)
$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-configure$(3):
@echo ":: configuring $(3)bit $(1)..." >&2 @echo ":: configuring $(3)bit $(1)..." >&2
touch $$@ touch $$@
$(OBJ)/.$(1)-build$(3): $$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2 @echo ":: building $(3)bit $(1)..." >&2
cd $$($(2)_SRC) && env $$($(2)_ENV$(3)) \ cd $$($(2)_SRC) && env $$($(2)_ENV$(3)) \
cargo build $$(filter -j%,$$(MAKEFLAGS)) --target "$$(ARCH$(3))-unknown-linux-gnu" --target-dir $$($(2)_OBJ$(3)) $$(CARGO_BUILD_ARG) cargo build $$(filter -j%,$$(MAKEFLAGS)) --target "$$(ARCH$(3))-unknown-linux-gnu" --target-dir $$($(2)_OBJ$(3)) $$(CARGO_BUILD_ARG)

4
make/rules-winemaker.mk
View file

@ -9,7 +9,7 @@ $(call create-rules-common,$(1),$(2),$(3))
$(2)_OBJ$(3) := $$($(2)_OBJ$(3))/$(4) $(2)_OBJ$(3) := $$($(2)_OBJ$(3))/$(4)
ifeq ($(CONTAINER),1) ifeq ($(CONTAINER),1)
$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-configure$(3):
@echo ":: configuring $(3)bit $(1)..." >&2 @echo ":: configuring $(3)bit $(1)..." >&2
rsync -arx "$$($(2)_SRC)/" "$$($(2)_OBJ$(3))/" rsync -arx "$$($(2)_SRC)/" "$$($(2)_OBJ$(3))/"
cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \ cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
@ -25,7 +25,7 @@ $(OBJ)/.$(1)-configure$(3):
sed -re 's@_LDFLAGS=@_LDFLAGS= $$$$(LDFLAGS) @' -i "$$($(2)_OBJ$(3))/Makefile" sed -re 's@_LDFLAGS=@_LDFLAGS= $$$$(LDFLAGS) @' -i "$$($(2)_OBJ$(3))/Makefile"
touch $$@ touch $$@
$(OBJ)/.$(1)-build$(3): $$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2 @echo ":: building $(3)bit $(1)..." >&2
rsync -arx "$$($(2)_SRC)/" "$$($(2)_OBJ$(3))/" rsync -arx "$$($(2)_SRC)/" "$$($(2)_OBJ$(3))/"
env $$($(2)_ENV$(3)) \ env $$($(2)_ENV$(3)) \