diff options
| author | fanquake <fanquake@gmail.com> | 2022-06-17 09:33:45 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-06-17 14:44:49 +0100 |
| commit | f862f4a74ec6d95a40bb86c5e6597739b23db932 (patch) | |
| tree | 0715f85873808b7e9ccc3e1bdafc977a98b131ac /depends/Makefile | |
| parent | 874529665c1c326fc86fc0d0d6c3512fab087ab8 (diff) | |
| download | bitcoin-f862f4a74ec6d95a40bb86c5e6597739b23db932.tar.xz | |
build: add *_STANDARD vars to depends gen_id
Followup to #22380. We need to have these in the id so that we rebuild
if we change / unset a *_STANDARD.
Diffstat (limited to 'depends/Makefile')
| -rw-r--r-- | depends/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/depends/Makefile b/depends/Makefile index 5a1c472a15..11fdd6dd53 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -144,8 +144,8 @@ include packages/packages.mk # 2. Before including packages/*.mk (excluding packages/packages.mk), since # they rely on the build_id variables # -build_id:=$(shell env CC='$(build_CC)' CXX='$(build_CXX)' AR='$(build_AR)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))') -$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' CXX='$(host_CXX)' AR='$(host_AR)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))') +build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(build_AR)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))') +$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(host_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(host_AR)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))') qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages) |