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.

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

Add options for rocksdb #57

Merged
merged 7 commits into from
Aug 13, 2018
Merged

Add options for rocksdb #57

merged 7 commits into from
Aug 13, 2018

Conversation

DorianZheng
Copy link
Contributor

No description provided.

Makefile Outdated
@@ -9,15 +9,18 @@ endif

ifeq ($(ROCKSDB_CHECK), 0)
TAGS += rocksdb
endif
CGO_CPPFLAGS += "-std=c++11"
CGO_LDFLAGS += "-g -O2 -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -llz4 -lzstd"
Copy link
Member

Choose a reason for hiding this comment

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

seem we don't need to pass these here?

Makefile Outdated
@@ -9,15 +9,18 @@ endif

ifeq ($(ROCKSDB_CHECK), 0)
TAGS += rocksdb
endif
CGO_CXXFLAGS := "${CGO_CXXFLAGS} -std=c++11"
CGO_LDFLAGS := "${CGO_LDFLAGS} -g -O2 -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -llz4 -lzstd"
Copy link
Member

Choose a reason for hiding this comment

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

can we remove -lrocksdb -lm -lz -lbz2 -lsnappy -llz4 -lzstd here?

above check has already checked -lrocksdb and for the following links, I prefer passing outside the Makefile manually.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, It seems that it's OK to remove it.

@@ -78,6 +78,7 @@
[[constraint]]
branch = "master"
name = "github.com/tecbot/gorocksdb"
source = "https://github.com/DorianZheng/gorocksdb.git"
Copy link
Member

Choose a reason for hiding this comment

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

please update vendor too

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok

@siddontang siddontang merged commit dfabd85 into pingcap:master Aug 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants