File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,8 @@ GCOV ?= gcov
10
10
SHELL = /bin/bash
11
11
GCOVR ?= gcovr
12
12
GIT ?= git
13
+ # make sure go toolchain defined in daemon/go.mod is always used
14
+ GOTOOLCHAIN =auto
13
15
14
16
include make/config.mk
15
17
include make/vendor.mk
@@ -165,9 +167,17 @@ agent-valgrind: agent/Makefile
165
167
# Configure the target directory for go install
166
168
export GOBIN =$(CURDIR ) /bin
167
169
170
+ .PHONY : daemon-golang-verify
171
+ daemon-golang-verify :
172
+ @golang_in_binary=$$(go version -m bin/daemon | awk '/^bin\/daemon/ {print $$2;}' ) \
173
+ && golang_from_toolchain=$$(awk '/^toolchain/ {print $$2;}' daemon/go.mod ) \
174
+ && [ " $$ golang_in_binary" = " $$ golang_from_toolchain" ] && echo " daemon built using: $$ golang_from_toolchain" \
175
+ || { echo " ERROR: daemon built using go: $$ golang_in_binary, required: $$ golang_from_toolchain" ; exit 1; }
176
+
168
177
.PHONY : daemon
169
178
daemon :
170
179
$(MAKE ) -C daemon
180
+ $(MAKE ) daemon-golang-verify
171
181
172
182
.PHONY : daemon_race
173
183
daemon_race :
Original file line number Diff line number Diff line change 1
1
module github.com/newrelic/newrelic-php-agent/daemon
2
2
3
3
go 1.24.0
4
- toolchain go1.24.4
4
+ toolchain go1.25.1
5
5
6
6
require (
7
7
github.com/golang/protobuf v1.5.3
You can’t perform that action at this time.
0 commit comments