feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GoCmdBridge: Fix issue when 'go' is not in path after configuring

Browse Source 
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>
This commit is contained in:
Eike Ziller
2024-07-30 12:46:11 +02:00
parent bf0041919b
commit 5723c68b5f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/gocmdbridge/server/CMakeLists.txt
View File

@@ -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") if ((${PLATFORM} STREQUAL "linux" OR (${PLATFORM} STREQUAL "windows" AND ${ARCHITECTURE} STREQUAL "amd64")) AND NOT UPX_BIN STREQUAL "UPX_BIN-NOTFOUND")
add_custom_command( add_custom_command(
OUTPUT "${OUTPUT}" 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} COMMAND ${UPX_BIN} -9 ${OUTPUT}
DEPENDS ${SOURCES} DEPENDS ${SOURCES}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -22,7 +22,7 @@ function(go_build NAME SOURCES PLATFORMS ARCHITECTURES LDFLAGS)
else() else()
add_custom_command( add_custom_command(
OUTPUT "${OUTPUT}" 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} DEPENDS ${SOURCES}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Building ${TARGET_NAME}" COMMENT "Building ${TARGET_NAME}"