1
0
Fork 0

removed unused patch

This commit is contained in:
Sangbum Kim 2016-06-26 03:31:12 +09:00
parent b1bbd96d97
commit d0af6129fd
1 changed files with 0 additions and 47 deletions

View File

@ -1,47 +0,0 @@
--- a/Makefile.COMMON 2016-03-31 21:27:13.088391632 +0900
--- b/Makefile.COMMON 2016-03-31 21:27:13.088391632 +0900
+++ Makefile.COMMON 2016-03-31 21:40:00.450234289 +0900
@@ -44,7 +44,7 @@
GOOS ?= $(shell uname | tr A-Z a-z)
GOARCH ?= $(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m)))
-GO_VERSION ?= 1.5.1
+GO_VERSION ?= 1.6
GOURL ?= https://golang.org/dl
GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH).tar.gz
GOPATH := $(CURDIR)/.build/gopath
--- a/Makefile.COMMON 2016-05-07 01:00:04.729197514 +0900
+++ b/Makefile.COMMON 2016-05-07 01:02:10.387244408 +0900
@@ -51,16 +51,9 @@
# Check for the correct version of go in the path. If we find it, use it.
# Otherwise, prepare to build go locally.
-ifeq ($(shell command -v "go" >/dev/null && go version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/'), $(GO_VERSION))
- GOCC ?= $(shell command -v "go")
- GOFMT ?= $(shell command -v "gofmt")
- GO ?= GOPATH=$(GOPATH) $(GOCC)
-else
- GOROOT ?= $(CURDIR)/.build/go$(GO_VERSION)
- GOCC ?= $(GOROOT)/bin/go
- GOFMT ?= $(GOROOT)/bin/gofmt
- GO ?= GOROOT=$(GOROOT) GOPATH=$(GOPATH) $(GOCC)
-endif
+GOCC ?= $(shell command -v "go")
+GOFMT ?= $(shell command -v "gofmt")
+GO ?= GOPATH=$(GOPATH) $(GOCC)
# Never honor GOBIN, should it be set at all.
unexport GOBIN
--- a/Makefile.COMMON 2016-05-07 01:00:04.729197514 +0900
+++ b/Makefile.COMMON 2016-05-07 01:00:19.126786174 +0900
@@ -79,8 +79,8 @@
@echo Abort now if you want to manually install it system-wide instead.
@echo
@sleep 5
- mkdir -p $(GOROOT)
- curl -L $(GOURL)/$(GOPKG) | tar -C $(GOROOT) --strip 1 -xz
+ #mkdir -p $(GOROOT)
+ #curl -L $(GOURL)/$(GOPKG) | tar -C $(GOROOT) --strip 1 -xz
$(SELFLINK):
mkdir -p $(dir $@)