Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,3 @@ __pycache__/

include/csv2/
debug.*
*.log
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ ifeq ($(origin PYTHON), undefined)
endif
export PYTHON

# EXTRA_CXXFLAGS += -I$(HOME)/local/include -gdwarf-4 -fsanitize=address
EXTRA_CXXFLAGS += -I$(HOME)/local/include -gdwarf-4 -DGFLAGS
LDFLAGS += -L$(HOME)/local/lib -lsocket++ -lgflags

CLEAN_FILES = # deliberately empty, so we can append below.
CFLAGS += ${EXTRA_CFLAGS}
CXXFLAGS += ${EXTRA_CXXFLAGS}
Expand Down Expand Up @@ -112,6 +116,8 @@ ifneq ($(findstring rocksdbjava, $(MAKECMDGOALS)),)
endif
endif

# DEBUG_LEVEL=1
DEBUG_LEVEL=0
$(info $$DEBUG_LEVEL is ${DEBUG_LEVEL})

# Lite build flag.
Expand Down Expand Up @@ -1310,6 +1316,11 @@ $(STATIC_LIBRARY): $(LIB_OBJECTS)
$(AM_V_AR)rm -f $@ $(SHARED1) $(SHARED2) $(SHARED3) $(SHARED4)
$(AM_V_at)$(AR) $(ARFLAGS) $@ $(LIB_OBJECTS)

# Add a target to build bloom_test with ART_PLUS defined
bloom_test_plus: util/bloom_test.cc $(LIBRARY) $(GTEST)
$(AM_V_CCLD)$(CXX) $(CXXFLAGS) -DART_PLUS -c util/bloom_test.cc -o $(OBJ_DIR)/util/bloom_test_plus.o
$(AM_V_CCLD)$(CXX) -o bloom_test_plus $(OBJ_DIR)/util/bloom_test_plus.o $(GTEST) $(LIBRARY) $(EXEC_LDFLAGS) $(LDFLAGS) $(COVERAGEFLAGS)

$(STATIC_TEST_LIBRARY): $(TEST_OBJECTS)
$(AM_V_AR)rm -f $@ $(SHARED_TEST_LIBRARY)
$(AM_V_at)$(AR) $(ARFLAGS) $@ $^
Expand Down
4 changes: 4 additions & 0 deletions YCSB/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ tags
compile_commands.json
.clangd/
.cache/

test_logs/
compile.log
*.log
11 changes: 7 additions & 4 deletions YCSB/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@

#---------------------build config-------------------------

CXXFLAGS += -I$(HOME)/local/include -gdwarf-4
LDFLAGS += -lstdc++
LDFLAGS += -L$(HOME)/local/lib -lsocket++

DEBUG_BUILD ?= 0
EXTRA_CXXFLAGS ?= -I../include -I../include/rocksdb
EXTRA_LDFLAGS ?= -L../ -lpmem -ldl
# EXTRA_CXXFLAGS += -I../include -I../include/rocksdb -fsanitize=address
EXTRA_CXXFLAGS += -I../include -I../include/rocksdb
EXTRA_LDFLAGS += -L../ -lpmem -ldl

BIND_ROCKSDB ?= 1
BIND_LEVELDB ?= 0
BIND_LMDB ?= 0

EXTRA_LDFLAGS += -lstdc++
EXTRA_LDFLAGS += -lsocket++
# EXTRA_LDFLAGS += -lpython3.12
# EXTRA_CXXFLAGS += -I$(PYTHON_INCLUDE_PATH)
# EXTRA_CXXFLAGS += -L$(PYTHON_LIBRARY_PATH)
Expand Down
Loading