Unverified Commit bc4d5bf5 authored by Yilin Chen's avatar Yilin Chen Committed by GitHub

Fix build failures on apple silicon (#605)

Signed-off-by: 's avatarYilin Chen <sticnarf@gmail.com>
Co-authored-by: 's avatarti-srebot <ti-srebot@pingcap.com>
parent d598816f
...@@ -32,7 +32,7 @@ cloud = [] ...@@ -32,7 +32,7 @@ cloud = []
[build-dependencies] [build-dependencies]
cc = "1.0.3" cc = "1.0.3"
cmake = "0.1" cmake = "0.1"
bindgen = { version = "0.51", default-features = false } bindgen = { version = "0.57", default-features = false, features = ["runtime"] }
[dependencies.tikv-jemalloc-sys] [dependencies.tikv-jemalloc-sys]
version = "0.4.0" version = "0.4.0"
......
...@@ -76,14 +76,14 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le") ...@@ -76,14 +76,14 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
endif(HAS_ALTIVEC) endif(HAS_ALTIVEC)
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le") endif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm64")
CHECK_C_COMPILER_FLAG("-march=armv8-a+crc" HAS_ARMV8_CRC) CHECK_C_COMPILER_FLAG("-march=armv8-a+crc" HAS_ARMV8_CRC)
if(HAS_ARMV8_CRC) if(HAS_ARMV8_CRC)
message(STATUS " HAS_ARMV8_CRC yes") message(STATUS " HAS_ARMV8_CRC yes")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crc -Wno-unused-function") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crc -Wno-unused-function")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc -Wno-unused-function") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc -Wno-unused-function")
endif(HAS_ARMV8_CRC) endif(HAS_ARMV8_CRC)
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm64")
option(PORTABLE "build a portable binary" OFF) option(PORTABLE "build a portable binary" OFF)
option(FORCE_SSE42 "force building with SSE4.2, even when PORTABLE=ON" OFF) option(FORCE_SSE42 "force building with SSE4.2, even when PORTABLE=ON" OFF)
......
...@@ -9,7 +9,6 @@ use std::ffi::{CStr, CString}; ...@@ -9,7 +9,6 @@ use std::ffi::{CStr, CString};
use std::fmt::{self, Debug, Formatter}; use std::fmt::{self, Debug, Formatter};
use std::io::Result; use std::io::Result;
use std::ptr; use std::ptr;
use std::sync::Arc;
#[derive(Clone, PartialEq, Eq)] #[derive(Clone, PartialEq, Eq)]
pub struct FileEncryptionInfo { pub struct FileEncryptionInfo {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment