Rust now integrated into bcachefs binary

Rust is now required for building the bcachefs tool, and rust code is
now fully integrated with the C codebase - meaning it is possible to
call back and forth.

The mount helper is now a subcommand, 'mount.bcachefs' is now a small
shell wrapper that invokes 'bcachefs mount'.

This will make it easier to start rewriting other subcommands in rust,
and eventually the whole command line interface.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

1 files changed, 1 insertions, 6 deletions

diff --git a/rust-src/bch_bindgen/build.rs b/rust-src/bch_bindgen/build.rs
index da1541b1..a2cb8957 100644
--- a/rust-src/bch_bindgen/build.rs
+++ b/rust-src/bch_bindgen/build.rs
@@ -7,13 +7,8 @@ fn main() {
     let top_dir: PathBuf = std::env::var_os("CARGO_MANIFEST_DIR")
         .expect("ENV Var 'CARGO_MANIFEST_DIR' Expected")
         .into();
-    let libbcachefs_inc_dir = std::env::var("LIBBCACHEFS_INCLUDE")
-        .unwrap_or_else(|_| top_dir.join("libbcachefs").display().to_string());
-    let libbcachefs_inc_dir = std::path::Path::new(&libbcachefs_inc_dir);
-    println!("{}", libbcachefs_inc_dir.display());
 
-    println!("cargo:rustc-link-lib=dylib=bcachefs");
-    println!("cargo:rustc-link-search={}", env!("LIBBCACHEFS_LIB"));
+    let libbcachefs_inc_dir = std::path::Path::new("../..");
 
     let _libbcachefs_dir = top_dir.join("libbcachefs").join("libbcachefs");
     let bindings = bindgen::builder()