StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix dumping variables of absolute paths."

Browse Source
This commit is contained in:
Ying Wang
2016-03-07 19:58:14 +00:00
committed by Gerrit Code Review
parent 880c9ffe7a 80ceadc945
commit dd70b91060
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/dumpvar.mk
View File

@@ -70,11 +70,7 @@ ifdef dumpvar_goals
absolute_dumpvar := $(strip $(filter abs-%,$(dumpvar_goals))) absolute_dumpvar := $(strip $(filter abs-%,$(dumpvar_goals)))
ifdef absolute_dumpvar ifdef absolute_dumpvar
dumpvar_goals := $(patsubst abs-%,%,$(dumpvar_goals)) dumpvar_goals := $(patsubst abs-%,%,$(dumpvar_goals))
ifneq ($(filter /%,$($(dumpvar_goals))),) DUMPVAR_VALUE := $(abspath $($(dumpvar_goals)))
DUMPVAR_VALUE := $($(dumpvar_goals))
else
DUMPVAR_VALUE := $(PWD)/$($(dumpvar_goals))
endif
dumpvar_target := dumpvar-abs-$(dumpvar_goals) dumpvar_target := dumpvar-abs-$(dumpvar_goals)
else else
DUMPVAR_VALUE := $($(dumpvar_goals)) DUMPVAR_VALUE := $($(dumpvar_goals))
@@ -115,7 +111,7 @@ ifneq ($(filter report_config, $(DUMP_MANY_VARS)),)
@echo "$(DUMP_VAR_PREFIX)report_config=\`$(report_config_sh)\`" @echo "$(DUMP_VAR_PREFIX)report_config=\`$(report_config_sh)\`"
endif endif
@$(foreach v, $(sort $(DUMP_MANY_ABS_VARS)),\ @$(foreach v, $(sort $(DUMP_MANY_ABS_VARS)),\
echo "$(DUMP_ABS_VAR_PREFIX)$(v)='$(PWD)/$($(v))'";) echo "$(DUMP_ABS_VAR_PREFIX)$(v)='$(abspath $($(v)))'";)
endif # CALLED_FROM_SETUP endif # CALLED_FROM_SETUP