gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'keydbpro' of https://github.com/JohnSully/KeyDB-Pro into keydbpro

Browse Source 
Former-commit-id: 4f39ca139f15a5f585f829937a46a56f20644db0
This commit is contained in:
John Sully 2020-01-12 01:27:22 -05:00
commit 7f74e0409f
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
deps/license/arm64/libkey.a vendored Normal file
View File

Binary file not shown.

0
deps/license/libkey.a → deps/license/x64/libkey.a vendored
View File

10
src/Makefile
View File

@ -54,6 +54,8 @@ ifneq ($(SANITIZE),)
USEASM=false USEASM=false
endif endif
# Do we use our assembly spinlock? X64 only # Do we use our assembly spinlock? X64 only
ifeq ($(uname_S),Linux) ifeq ($(uname_S),Linux)
ifeq ($(uname_M),x86_64) ifeq ($(uname_M),x86_64)
@ -82,6 +84,12 @@ ifneq (,$(findstring armv,$(uname_M)))
endif endif
endif endif
ifneq (,$(filter aarch64 armv,$(uname_M)))
LICENSE_LIB_DIR=../deps/license/arm64/
else
LICENSE_LIB_DIR=../deps/licese/x64/
endif
# Backwards compatibility for selecting an allocator # Backwards compatibility for selecting an allocator
ifeq ($(USE_TCMALLOC),yes) ifeq ($(USE_TCMALLOC),yes)
MALLOC=tcmalloc MALLOC=tcmalloc
@ -105,7 +113,7 @@ endif
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(REDIS_CFLAGS) FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(REDIS_CFLAGS)
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
FINAL_LIBS=-lm -lz -latomic -L../deps/license/ -lkey -lcrypto FINAL_LIBS=-lm -lz -latomic -L$(LICENSE_LIB_DIR) -lkey -lcrypto
DEBUG=-g -ggdb DEBUG=-g -ggdb
ifeq ($(uname_S),SunOS) ifeq ($(uname_S),SunOS)