Skip to content

Commit f862f4a

Browse files
committed
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.
1 parent 8745296 commit f862f4a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

depends/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ include packages/packages.mk
144144
# 2. Before including packages/*.mk (excluding packages/packages.mk), since
145145
# they rely on the build_id variables
146146
#
147-
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))')
148-
$(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))')
147+
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))')
148+
$(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))')
149149

150150
qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages)
151151

depends/gen_id

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env bash
22

3-
# Usage: env [ CC=... ] [ CXX=... ] [ AR=... ] [ RANLIB=... ] [ STRIP=... ] \
4-
# [ DEBUG=... ] [ LTO=... ] ./build-id [ID_SALT]...
3+
# Usage: env [ CC=... ] [ C_STANDARD=...] [ CXX=... ] [CXX_STANDARD=...] \
4+
# [ AR=... ] [ RANLIB=... ] [ STRIP=... ] [ DEBUG=... ] \
5+
# [ LTO=... ] ./build-id [ID_SALT]...
56
#
67
# Prints to stdout a SHA256 hash representing the current toolset, used by
78
# depends/Makefile as a build id for caching purposes (detecting when the
@@ -39,12 +40,14 @@
3940
bash -c "${CC} -v"
4041
bash -c "${CC} -v -E -xc -o /dev/null - < /dev/null"
4142
bash -c "${CC} -v -E -xobjective-c -o /dev/null - < /dev/null"
43+
echo "C_STANDARD=${C_STANDARD}"
4244
echo "END CC"
4345

4446
echo "BEGIN CXX"
4547
bash -c "${CXX} -v"
4648
bash -c "${CXX} -v -E -xc++ -o /dev/null - < /dev/null"
4749
bash -c "${CXX} -v -E -xobjective-c++ -o /dev/null - < /dev/null"
50+
echo "CXX_STANDARD=${CXX_STANDARD}"
4851
echo "END CXX"
4952

5053
echo "BEGIN AR"

0 commit comments

Comments
 (0)