From 14e51caf3058c4bb0a577108c4928fc0b049161c Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 16 Oct 2023 15:00:31 +0200 Subject: [PATCH] build: Don't read MODULEPATH from environment The Makefile uses a variable named MODULEPATH for the name of the crc go module. It currently can be overridden with an env var, but I don't think this was ever tested, and this causes issues as some recent fedora package sets MODULEPATH in the env. This commit drops the environment override for MODULEPATH. This should fix https://github.com/crc-org/crc/issues/3865 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1a0bc6fd5..4270722353 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ GOARCH ?= $(shell go env GOARCH) HOST_BUILD_DIR=$(BUILD_DIR)/$(GOOS)-$(GOARCH) GOPATH ?= $(shell go env GOPATH) ORG := github.com/crc-org -MODULEPATH ?= $(ORG)/crc/v2 +MODULEPATH = $(ORG)/crc/v2 PACKAGE_DIR := packaging/$(GOOS) SOURCES := $(shell git ls-files *.go ":^vendor")