diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-12-09 13:36:46 +0000 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-12-09 13:36:46 +0000 |
| commit | 978852aad8e295c26801e17f2ee9e58edd4a5703 (patch) | |
| tree | cdae603038e03e689a7fe028aef123066cbb0c1a /depends | |
| parent | 16624e6ff3af4429e571f7a606bbbcac336e067a (diff) | |
| download | bitcoin-978852aad8e295c26801e17f2ee9e58edd4a5703.tar.xz | |
build: Fix depends build system when working with subtargets
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/funcs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/depends/funcs.mk b/depends/funcs.mk index 2b21d053b1..6b333f940e 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -76,7 +76,7 @@ $(1)_extracted=$$($(1)_extract_dir)/.stamp_extracted $(1)_preprocessed=$$($(1)_extract_dir)/.stamp_preprocessed $(1)_cleaned=$$($(1)_extract_dir)/.stamp_cleaned $(1)_built=$$($(1)_build_dir)/.stamp_built -$(1)_configured=$$($(1)_build_dir)/.stamp_configured +$(1)_configured=$(host_prefix)/.$(1)_stamp_configured $(1)_staged=$$($(1)_staging_dir)/.stamp_staged $(1)_postprocessed=$$($(1)_staging_prefix_dir)/.stamp_postprocessed $(1)_download_path_fixed=$(subst :,\:,$$($(1)_download_path)) @@ -214,8 +214,8 @@ $($(1)_preprocessed): | $($(1)_extracted) $($(1)_configured): | $($(1)_dependencies) $($(1)_preprocessed) echo Configuring $(1)... 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); ) - mkdir -p $$(@D) - +{ cd $$(@D); export $($(1)_config_env); $($(1)_config_cmds); } $$($(1)_logging) + mkdir -p $$($(1)_build_dir) + +{ cd $$($(1)_build_dir); export $($(1)_config_env); $($(1)_config_cmds); } $$($(1)_logging) touch $$@ $($(1)_built): | $($(1)_configured) echo Building $(1)... |