From 96322a6df9f7f18c60ba643f27f420ff1640d396 Mon Sep 17 00:00:00 2001
From: Zachary Yedidia <zyedidia@gmail.com>
Date: Thu, 26 Dec 2019 22:03:30 -0500
Subject: [PATCH] Update makefile and vendor script

---
 Makefile               | 11 +++++------
 tools/compile-linux.sh |  4 ----
 tools/cross-compile.sh |  4 ----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 74e03cfc..d59695c5 100644
--- a/Makefile
+++ b/Makefile
@@ -10,32 +10,31 @@ ADDITIONAL_GO_LINKER_FLAGS := $(shell GOOS=$(shell go env GOHOSTOS) \
 	go run tools/info-plist.go "$(VERSION)")
 GOBIN ?= $(shell go env GOPATH)/bin
 GOVARS := -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF
-GOTAGS := osusergo
 
 # Builds micro after checking dependencies but without updating the runtime
 build:
-	go build -tags $(GOTAGS) -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go build -mod=readonly -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 build-dbg:
-	go build -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go build -mod=readonly -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Builds micro after building the runtime and checking dependencies
 build-all: runtime build
 
 # Builds micro without checking for dependencies
 build-quick:
-	go build -tags $(GOTAGS) -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go build -mod=readonly -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Same as 'build' but installs to $GOBIN afterward
 install:
-	go install -tags $(GOTAGS) -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go install -mod=readonly -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Same as 'build-all' but installs to $GOBIN afterward
 install-all: runtime install
 
 # Same as 'build-quick' but installs to $GOBIN afterward
 install-quick:
-	go install -tags $(GOTAGS) -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)"  ./cmd/micro
+	go install -mod=readonly -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)"  ./cmd/micro
 
 # Builds the runtime
 runtime:
diff --git a/tools/compile-linux.sh b/tools/compile-linux.sh
index f2e5498e..fca865dd 100755
--- a/tools/compile-linux.sh
+++ b/tools/compile-linux.sh
@@ -1,12 +1,8 @@
-# ./vendor-src.sh micro-$1-src
 cd ..
 
 mkdir -p binaries
 mkdir -p micro-$1
 
-mv micro-$1-src.tar.gz binaries
-mv micro-$1-src.zip binaries
-
 cp LICENSE micro-$1
 cp README.md micro-$1
 cp LICENSE-THIRD-PARTY micro-$1
diff --git a/tools/cross-compile.sh b/tools/cross-compile.sh
index 1cce1a82..ad80af89 100755
--- a/tools/cross-compile.sh
+++ b/tools/cross-compile.sh
@@ -1,12 +1,8 @@
-# ./vendor-src.sh micro-$1-src
 cd ..
 
 mkdir -p binaries
 mkdir -p micro-$1
 
-mv micro-$1-src.tar.gz binaries
-mv micro-$1-src.zip binaries
-
 cp LICENSE micro-$1
 cp README.md micro-$1
 cp LICENSE-THIRD-PARTY micro-$1