File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -144,8 +144,8 @@ include packages/packages.mk
144
144
# 2. Before including packages/*.mk (excluding packages/packages.mk), since
145
145
# they rely on the build_id variables
146
146
#
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 ) ) ')
149
149
150
150
qrencode_packages_$(NO_QR) = $(qrencode_$(host_os ) _packages )
151
151
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
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]...
5
6
#
6
7
# Prints to stdout a SHA256 hash representing the current toolset, used by
7
8
# depends/Makefile as a build id for caching purposes (detecting when the
39
40
bash -c " ${CC} -v"
40
41
bash -c " ${CC} -v -E -xc -o /dev/null - < /dev/null"
41
42
bash -c " ${CC} -v -E -xobjective-c -o /dev/null - < /dev/null"
43
+ echo " C_STANDARD=${C_STANDARD} "
42
44
echo " END CC"
43
45
44
46
echo " BEGIN CXX"
45
47
bash -c " ${CXX} -v"
46
48
bash -c " ${CXX} -v -E -xc++ -o /dev/null - < /dev/null"
47
49
bash -c " ${CXX} -v -E -xobjective-c++ -o /dev/null - < /dev/null"
50
+ echo " CXX_STANDARD=${CXX_STANDARD} "
48
51
echo " END CXX"
49
52
50
53
echo " BEGIN AR"
You can’t perform that action at this time.
0 commit comments