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

fix(dgraph): making jemalloc to work with dgraph on macos #7247

Merged
merged 3 commits into from
Jan 7, 2021
Merged

fix(dgraph): making jemalloc to work with dgraph on macos #7247

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c03298b
making jemalloc to work with dgraph on macos
aman-bansal Jan 5, 2021
96ed7f1
updating ristretto to latest version
aman-bansal Jan 6, 2021
0e404a1
running it tidy
aman-bansal Jan 6, 2021
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
4 changes: 2 additions & 2 deletions dgraph/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ BUILD_VERSION ?= $(shell git describe --always --tags)
endif

GOOS ?= $(shell go env GOOS)
# Only build with jemalloc on Linux
ifeq ($(GOOS),linux)
# Only build with jemalloc on Linux, mac
ifeq ($(GOOS),$(filter $(GOOS),linux darwin))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danielmai do you remember why we didn't enable jemalloc for mac initially?

BUILD_TAGS ?= jemalloc
endif
GOPATH ?= $(shell go env GOPATH)
Expand Down