Skip to content

Commit 7e278a1

Browse files
Merge pull request #2470 from actiontech/issue-2468
Revert "make it possible to specify GOARCH when compile"
2 parents d577609 + 4ab71fa commit 7e278a1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ default: install
6262
######################################## Code Check ####################################################
6363
## Static Code Analysis
6464
vet: swagger
65-
GOOS=$(GOOS) GOARCH=$(GOARCH) go vet $$(GOOS=${GOOS} GOARCH=${GOARCH} go list ./...)
65+
GOOS=$(GOOS) GOARCH=amd64 go vet $$(GOOS=${GOOS} GOARCH=${GOARCH} go list ./...)
6666

6767
## Unit Test
68-
test:
69-
cd $(PROJECT_NAME) && GOOS=$(GOOS) GOARCH=$(GOARCH) go test -v ./... -count 1
68+
test:
69+
cd $(PROJECT_NAME) && GOOS=$(GOOS) GOARCH=amd64 go test -v ./... -count 1
7070

7171
clean:
7272
GOOS=$(GOOS) GOARCH=$(GOARCH) go clean
@@ -82,12 +82,12 @@ install_scannerd:
8282
dlv_install:
8383
GOOS=$(GOOS) GOARCH=$(GOARCH) go build -gcflags "all=-N -l" $(GO_BUILD_FLAGS) ${LDFLAGS} -tags $(GO_BUILD_TAGS) -o $(GOBIN)/sqled ./$(PROJECT_NAME)/cmd/sqled
8484
swagger:
85-
GOARCH=$(GOARCH) go build -o ${shell pwd}/bin/swag ${shell pwd}/build/swag/main.go
85+
GOARCH=amd64 go build -o ${shell pwd}/bin/swag ${shell pwd}/build/swag/main.go
8686
rm -rf ${shell pwd}/sqle/docs
8787
${shell pwd}/bin/swag init -g ./$(PROJECT_NAME)/api/app.go -o ${shell pwd}/sqle/docs
8888

8989
parser:
90-
cd build/goyacc && GOOS=${GOOS} GOARCH=$(GOARCH) GOBIN=$(GOBIN) go install
90+
cd build/goyacc && GOOS=${GOOS} GOARCH=amd64 GOBIN=$(GOBIN) go install
9191
$(GOBIN)/goyacc -o /dev/null ${PARSER_PATH}/parser.y
9292
$(GOBIN)/goyacc -o ${PARSER_PATH}/parser.go ${PARSER_PATH}/parser.y 2>&1 | egrep "(shift|reduce)/reduce" | awk '{print} END {if (NR > 0) {print "Find conflict in parser.y. Please check y.output for more information."; exit 1;}}'
9393
rm -f y.output

0 commit comments

Comments
 (0)