Skip to content

Commit 0375244

Browse files
committed
Merge bitcoin/bitcoin#29249: depends: add NM output to gen_id
6ec2813 depends: add NM output to gen_id (fanquake) Pull request description: `NM` is part of the current toolset, and can be set by the user. Include it in `gen_id`. ACKs for top commit: TheCharlatan: Re-ACK 6ec2813 Tree-SHA512: 2ada61e03783f9eb441f285ef5da50557ad729cb52ce2d2c4b2c38103dab29920a26262d4545fd2ac7fbf1cedc4902cd2359833544fbc0debf829c12a63e9769
2 parents 5f3a057 + 6ec2813 commit 0375244

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

depends/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ include packages/packages.mk
147147
# 2. Before including packages/*.mk (excluding packages/packages.mk), since
148148
# they rely on the build_id variables
149149
#
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))')
152152

153153
boost_packages_$(NO_BOOST) = $(boost_packages)
154154

depends/gen_id

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
# Usage: env [ CC=... ] [ C_STANDARD=...] [ CXX=... ] [CXX_STANDARD=...] \
4-
# [ AR=... ] [ RANLIB=... ] [ STRIP=... ] [ DEBUG=... ] \
4+
# [ AR=... ] [ NM=... ] [ RANLIB=... ] [ STRIP=... ] [ DEBUG=... ] \
55
# [ LTO=... ] [ NO_HARDEN=... ] ./build-id [ID_SALT]...
66
#
77
# Prints to stdout a SHA256 hash representing the current toolset, used by
@@ -56,6 +56,11 @@
5656
echo "ZERO_AR_DATE=${ZERO_AR_DATE}"
5757
echo "END AR"
5858

59+
echo "BEGIN NM"
60+
bash -c "${NM} --version"
61+
env | grep '^NM_'
62+
echo "END NM"
63+
5964
echo "BEGIN RANLIB"
6065
bash -c "${RANLIB} --version"
6166
env | grep '^RANLIB_'

0 commit comments

Comments
 (0)