Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix race build option not supported issue in armhf #150

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Fix race build option not supported issue in armhf #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ export GOPATH=$(HOME)/go
export GOBIN=$(GOPATH)/bin
export GO111MODULE=on
export GOFLAGS=-modcacherw
RACE_OPTION := -race
ifeq ($(CONFIGURED_ARCH),armhf)
RACE_OPTION :=
endif

all: install build

Expand All @@ -16,10 +20,10 @@ install: build
build: $(GOPATH)/bin/go-server-server $(GOPATH)/bin/go-server-server.test

$(GOPATH)/bin/go-server-server: libcswsscommon $(GOPATH)/src/go-server-server/main.go
cd $(GOPATH)/src/go-server-server && $(GO) get -v && $(GO) build -race -v
cd $(GOPATH)/src/go-server-server && $(GO) get -v && $(GO) build $(RACE_OPTION) -v

$(GOPATH)/bin/go-server-server.test: libcswsscommon $(GOPATH)/src/go-server-server/main.go
cd $(GOPATH)/src/go-server-server && $(GO) get -v && $(GO) test -race -c -covermode=atomic -coverpkg "go-server-server/go" -v -o $(GOPATH)/bin/go-server-server.test
cd $(GOPATH)/src/go-server-server && $(GO) get -v && $(GO) test $(RACE_OPTION) -c -covermode=atomic -coverpkg "go-server-server/go" -v -o $(GOPATH)/bin/go-server-server.test

$(GOPATH)/src/go-server-server/main.go:
mkdir -p $(GOPATH)/src
Expand Down
6 changes: 5 additions & 1 deletion mseethrifttest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
#FIXME: Create better rules
#FIXME: Check and write all dependencies

RACE_OPTION := -race
ifeq ($(CONFIGURED_ARCH),armhf)
RACE_OPTION :=
endif

.INTERMEDIATE: msee.thrift.intermediate

all: client

client: client.go ../mseethrift/msee.go
go build -race client.go
go build $(RACE_OPTION) client.go

msee/constants.go msee/msee.go msee/ttypes.go: msee.thrift.intermediate
go get "git.apache.org/thrift.git/lib/go/thrift"
Expand Down