Skip to content

Commit 233d825

Browse files
authored
Merge pull request #235 from setlog/fix/go_module_deps
Remove explicit deactivation of GO111MODULE
2 parents e2ee402 + 0ce9dd1 commit 233d825

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ VALIDATOR_BINARY := validator
1313
SIGNER_BINARY := signer
1414

1515
# allow custom program name
16-
LAUNCHER_PROGRAM_NAME := $(shell GO111MODULE=on go run cmd/echo_field/main.go cmd/launcher/resources/launcher-config.json BinaryName)
16+
LAUNCHER_PROGRAM_NAME := $(shell go run cmd/echo_field/main.go cmd/launcher/resources/launcher-config.json BinaryName)
1717
LAUNCHER_PROGRAM_EXT :=
18-
LAUNCHER_BRANDING_NAME := $(shell GO111MODULE=on go run cmd/echo_field/main.go cmd/launcher/resources/launcher-config.json BrandingName)
18+
LAUNCHER_BRANDING_NAME := $(shell go run cmd/echo_field/main.go cmd/launcher/resources/launcher-config.json BrandingName)
1919
MSI_PREFIX := ${LAUNCHER_PROGRAM_NAME}
2020

2121
GITDESC := $(shell git describe --tags 2> /dev/null || echo unavailable)
@@ -57,7 +57,6 @@ endif
5757
$(info Detected uname-id '${OS_UNAME}' as OS '${OS}')
5858

5959
# Globally enable go modules
60-
export GO111MODULE=on
6160
export GOOS=${OS}
6261
export LAUNCHER_PROGRAM_NAME
6362
export LAUNCHER_PROGRAM_EXT
@@ -213,7 +212,7 @@ copy-test-files: ## Copy example resources into resource directory
213212
cp examples/defaulticon.ico cmd/launcher/resources/icon.ico
214213

215214
generate: ## Run go generate
216-
GO111MODULE=off go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo
215+
go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo
217216
go generate -installsuffix _separate -ldflags '${LDFLAGS}' ${MODULE_PATH_LAUNCHER}
218217

219218
clean: ## Clean generated files

0 commit comments

Comments
 (0)