Skip to content

Commit d44fcd3

Browse files
committed
build: Make $(package)_*_env available to all $(package)_*_cmds
1 parent 7d51560 commit d44fcd3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

depends/funcs.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ $(1)_download_path_fixed=$(subst :,\:,$$($(1)_download_path))
8787
$(1)_fetch_cmds ?= $(call fetch_file,$(1),$(subst \:,:,$$($(1)_download_path_fixed)),$$($(1)_download_file),$($(1)_file_name),$($(1)_sha256_hash))
8888
$(1)_extract_cmds ?= mkdir -p $$($(1)_extract_dir) && echo "$$($(1)_sha256_hash) $$($(1)_source)" > $$($(1)_extract_dir)/.$$($(1)_file_name).hash && $(build_SHA256SUM) -c $$($(1)_extract_dir)/.$$($(1)_file_name).hash && $(build_TAR) --no-same-owner --strip-components=1 -xf $$($(1)_source)
8989
$(1)_preprocess_cmds ?= true
90-
$(1)_build_cmds ?=
91-
$(1)_config_cmds ?=
92-
$(1)_stage_cmds ?=
90+
$(1)_build_cmds ?= true
91+
$(1)_config_cmds ?= true
92+
$(1)_stage_cmds ?= true
9393
$(1)_set_vars ?=
9494

9595

@@ -214,17 +214,17 @@ $($(1)_configured): | $($(1)_dependencies) $($(1)_preprocessed)
214214
echo Configuring $(1)...
215215
rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), $(build_TAR) --no-same-owner -xf $($(package)_cached); )
216216
mkdir -p $$(@D)
217-
+{ cd $$(@D); $($(1)_config_env) $($(1)_config_cmds); } $$($(1)_logging)
217+
+{ cd $$(@D); export $($(1)_config_env); $($(1)_config_cmds); } $$($(1)_logging)
218218
touch $$@
219219
$($(1)_built): | $($(1)_configured)
220220
echo Building $(1)...
221221
mkdir -p $$(@D)
222-
+{ cd $$(@D); $($(1)_build_env) $($(1)_build_cmds); } $$($(1)_logging)
222+
+{ cd $$(@D); export $($(1)_build_env); $($(1)_build_cmds); } $$($(1)_logging)
223223
touch $$@
224224
$($(1)_staged): | $($(1)_built)
225225
echo Staging $(1)...
226226
mkdir -p $($(1)_staging_dir)/$(host_prefix)
227-
+{ cd $($(1)_build_dir); $($(1)_stage_env) $($(1)_stage_cmds); } $$($(1)_logging)
227+
+{ cd $($(1)_build_dir); export $($(1)_stage_env); $($(1)_stage_cmds); } $$($(1)_logging)
228228
rm -rf $($(1)_extract_dir)
229229
touch $$@
230230
$($(1)_postprocessed): | $($(1)_staged)

0 commit comments

Comments
 (0)