From 5723c68b5fc1c1900ecf05c509dd0f5daa0d22d4 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 30 Jul 2024 12:46:11 +0200
Subject: [PATCH] GoCmdBridge: Fix issue when 'go' is not in path after
 configuring

Use the full path to the 'go' executable instead of assuming that it is
in the PATH, like already done for upx.

Change-Id: Ic28c4d0b729a66bc4917c1133d4b91b9c2c019eb
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
---
 src/libs/gocmdbridge/server/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/gocmdbridge/server/CMakeLists.txt b/src/libs/gocmdbridge/server/CMakeLists.txt
index cb2d0dd2eb3..2e7b3425360 100644
--- a/src/libs/gocmdbridge/server/CMakeLists.txt
+++ b/src/libs/gocmdbridge/server/CMakeLists.txt
@@ -11,7 +11,7 @@ function(go_build NAME SOURCES PLATFORMS ARCHITECTURES LDFLAGS)
             if ((${PLATFORM} STREQUAL "linux" OR (${PLATFORM} STREQUAL "windows" AND ${ARCHITECTURE} STREQUAL "amd64")) AND NOT UPX_BIN STREQUAL "UPX_BIN-NOTFOUND")
                 add_custom_command(
                     OUTPUT "${OUTPUT}"
-                    COMMAND ${CMAKE_COMMAND} -E env GOARCH=${ARCHITECTURE} GOOS=${PLATFORM} go build -ldflags "-s -w ${LDFLAGS}" -o ${OUTPUT}
+                    COMMAND ${CMAKE_COMMAND} -E env GOARCH=${ARCHITECTURE} GOOS=${PLATFORM} ${GO_BIN} build -ldflags "-s -w ${LDFLAGS}" -o ${OUTPUT}
                     COMMAND ${UPX_BIN} -9 ${OUTPUT}
                     DEPENDS ${SOURCES}
                     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -22,7 +22,7 @@ function(go_build NAME SOURCES PLATFORMS ARCHITECTURES LDFLAGS)
             else()
                 add_custom_command(
                     OUTPUT "${OUTPUT}"
-                    COMMAND ${CMAKE_COMMAND} -E env GOARCH=${ARCHITECTURE} GOOS=${PLATFORM} go build -ldflags "-s -w ${LDFLAGS}" -o ${OUTPUT}
+                    COMMAND ${CMAKE_COMMAND} -E env GOARCH=${ARCHITECTURE} GOOS=${PLATFORM} ${GO_BIN} build -ldflags "-s -w ${LDFLAGS}" -o ${OUTPUT}
                     DEPENDS ${SOURCES}
                     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                     COMMENT "Building ${TARGET_NAME}"