From 320be1f060af6c105fe9bee2c46761142c794b8a Mon Sep 17 00:00:00 2001 From: Ziyang Hu Date: Wed, 6 Jul 2022 13:01:46 +0800 Subject: [PATCH] building on linux --- cozorocks/build_rocksdb.sh | 23 +++++++++++++++-------- cozorocks/src/tests.rs | 4 +--- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/cozorocks/build_rocksdb.sh b/cozorocks/build_rocksdb.sh index 94e01ab2..939b1058 100644 --- a/cozorocks/build_rocksdb.sh +++ b/cozorocks/build_rocksdb.sh @@ -1,3 +1,10 @@ +if [[ "$OSTYPE" == "linux-gnu"* ]]; then + export CC=/usr/bin/clang-10 + export CPP=/usr/bin/clang-cpp-10 + export CXX=/usr/bin/clang++-10 + export LD=/usr/bin/ld.lld-10 +fi + mkdir -p deps INSTALL_DIR=$(readlink -f deps) echo "$INSTALL_DIR" @@ -16,14 +23,14 @@ make clean export JEMALLOC_BASE=$INSTALL_DIR DEBUG_LEVEL=0 \ -JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/" \ -JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc.a" \ -USE_RTTI=1 \ -USE_CLANG=1 \ -JEMALLOC=1 \ -PREFIX=$INSTALL_DIR \ -make install-static || exit + JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/" \ + JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc.a" \ + USE_RTTI=1 \ + USE_CLANG=1 \ + JEMALLOC=1 \ + PREFIX=$INSTALL_DIR \ + make install-static || exit DEBUG_LEVEL=0 make libz.a libsnappy.a liblz4.a libzstd.a mv ./*.a ../deps/lib || exit -make clean \ No newline at end of file +make clean diff --git a/cozorocks/src/tests.rs b/cozorocks/src/tests.rs index 04295969..f6b77d09 100644 --- a/cozorocks/src/tests.rs +++ b/cozorocks/src/tests.rs @@ -1,8 +1,6 @@ use crate::*; -#[allow(improper_ctypes_definitions)] -#[no_mangle] -extern "C" fn test_comparator(a: &[u8], b: &[u8]) -> i8 { +fn test_comparator(a: &[u8], b: &[u8]) -> i8 { use std::cmp::Ordering::*; let res = a.cmp(b);