From 391e0638cc075b3aa9d526f7a40f86bc2222e57b Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 2 Feb 2020 02:43:35 +0000 Subject: [PATCH] Check if go exists before generating the GOPATH (#10100) * Check if go exists before generating the GOPATH * Move export PATH into Go protected section Co-authored-by: techknowlogick --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 688114fb3f..39afc0c007 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,13 @@ export GO111MODULE=off GO ?= go SED_INPLACE := sed -i SHASUM ?= shasum -a 256 -GOPATH ?= $(shell $(GO) env GOPATH) +HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" ) + +ifeq ($(HAS_GO), GO) + GOPATH ?= $(shell $(GO) env GOPATH) + export PATH := $(GOPATH)/bin:$(PATH) +endif -export PATH := $(GOPATH)/bin:$(PATH) ifeq ($(OS), Windows_NT) EXECUTABLE ?= gitea.exe