File tree 2 files changed +8
-3
lines changed
2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -147,8 +147,8 @@ include packages/packages.mk
147
147
# 2. Before including packages/*.mk (excluding packages/packages.mk), since
148
148
# they rely on the build_id variables
149
149
#
150
- 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 ) ' NO_HARDEN='$(NO_HARDEN ) ' ./gen_id '$(BUILD_ID_SALT ) ' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT ) ) ')
151
- $(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 ) ' NO_HARDEN='$(NO_HARDEN ) ' ./gen_id '$(HOST_ID_SALT ) ' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT ) ) ')
150
+ build_id: =$(shell env CC='$(build_CC ) ' C_STANDARD='$(C_STANDARD ) ' CXX='$(build_CXX ) ' CXX_STANDARD='$(CXX_STANDARD ) ' AR='$(build_AR ) 'NM=' $( build_NM ) ' RANLIB='$(build_RANLIB ) ' STRIP='$(build_STRIP ) ' SHA256SUM='$(build_SHA256SUM ) ' DEBUG='$(DEBUG ) ' LTO='$(LTO ) ' NO_HARDEN='$(NO_HARDEN ) ' ./gen_id '$(BUILD_ID_SALT ) ' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT ) ) ')
151
+ $(host_arch)_$(host_os)_id: =$(shell env CC='$(host_CC ) ' C_STANDARD='$(C_STANDARD ) ' CXX='$(host_CXX ) ' CXX_STANDARD='$(CXX_STANDARD ) ' AR='$(host_AR ) ' NM=' $( host_NM ) ' RANLIB='$(host_RANLIB ) ' STRIP='$(host_STRIP ) ' SHA256SUM='$(build_SHA256SUM ) ' DEBUG='$(DEBUG ) ' LTO='$(LTO ) ' NO_HARDEN='$(NO_HARDEN ) ' ./gen_id '$(HOST_ID_SALT ) ' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT ) ) ')
152
152
153
153
boost_packages_$(NO_BOOST) = $(boost_packages )
154
154
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
3
# Usage: env [ CC=... ] [ C_STANDARD=...] [ CXX=... ] [CXX_STANDARD=...] \
4
- # [ AR=... ] [ RANLIB=... ] [ STRIP=... ] [ DEBUG=... ] \
4
+ # [ AR=... ] [ NM=... ] [ RANLIB=... ] [ STRIP=... ] [ DEBUG=... ] \
5
5
# [ LTO=... ] [ NO_HARDEN=... ] ./build-id [ID_SALT]...
6
6
#
7
7
# Prints to stdout a SHA256 hash representing the current toolset, used by
56
56
echo " ZERO_AR_DATE=${ZERO_AR_DATE} "
57
57
echo " END AR"
58
58
59
+ echo " BEGIN NM"
60
+ bash -c " ${NM} --version"
61
+ env | grep ' ^NM_'
62
+ echo " END NM"
63
+
59
64
echo " BEGIN RANLIB"
60
65
bash -c " ${RANLIB} --version"
61
66
env | grep ' ^RANLIB_'
You can’t perform that action at this time.
0 commit comments