From 6bf579471c0bd654b070e2d34875f3e5cd6eb975 Mon Sep 17 00:00:00 2001 From: Jeffrey Quesnelle Date: Wed, 6 Dec 2017 01:29:23 -0500 Subject: [PATCH] fixes windows build --- librocksdb-sys/build.rs | 11 +++++------ librocksdb-sys/rocksdb | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/librocksdb-sys/build.rs b/librocksdb-sys/build.rs index b0b2d10..3ac2dcc 100644 --- a/librocksdb-sys/build.rs +++ b/librocksdb-sys/build.rs @@ -94,8 +94,8 @@ fn build_rocksdb() { .cloned() .filter(|file| match *file { "port/port_posix.cc" | - "util/env_posix.cc" | - "util/io_posix.cc" => false, + "env/env_posix.cc" | + "env/io_posix.cc" => false, _ => true, }) .collect::>(); @@ -112,12 +112,11 @@ fn build_rocksdb() { config.flag("-EHsc"); } else { config.flag("-std=c++11"); + // this was breaking the build on travis due to + // > 4mb of warnings emitted. + config.flag("-Wno-unused-parameter"); } - // this was breaking the build on travis due to - // > 4mb of warnings emitted. - config.flag("-Wno-unused-parameter"); - for file in lib_sources { let file = "rocksdb/".to_string() + file; config.file(&file); diff --git a/librocksdb-sys/rocksdb b/librocksdb-sys/rocksdb index bbd65ab..acf935e 160000 --- a/librocksdb-sys/rocksdb +++ b/librocksdb-sys/rocksdb @@ -1 +1 @@ -Subproject commit bbd65abcfc156a4777d10250601761691e2fcef3 +Subproject commit acf935e40f9d6f4c3d13c7d310def7064c1f1c95