resolve conflicts with rust-bio#193

TomKellyGenetics · Jun 5, 2020 · aa05718 · aa05718
1 parent b151b44
commit aa05718
Showing 1 changed file with 1 addition and 36 deletions.
diff --git a/hts-sys/build.rs b/hts-sys/build.rs
@@ -79,42 +79,6 @@ fn main() {
     let tool = cfg.get_compiler();
     let (cc_path, cflags_env) = (tool.path(), tool.cflags_env());
     let cc_cflags = cflags_env.to_string_lossy().replace("-O0", "");
-    if !Command::new("autoheader")
-        .current_dir(out.join("htslib"))
-        .status()
-        .unwrap()
-        .success()
-    {
-        panic!("failed to build htslib");
-    }
-   if !Command::new("autoconf")
-        .current_dir(out.join("htslib"))
-        .status()
-        .unwrap()
-        .success()
-    {
-        panic!("failed to build htslib");
-    }
-    if !Command::new("sh")
-        .current_dir(out.join("htslib"))
-        .arg("./configure")
-        .arg(format!("CC=clang".to_string()))
-        .status()
-        .unwrap()
-        .success()
-    {
-        panic!("failed to build htslib");
-    }
-    if !Command::new("sh")
-        .current_dir(out.join("htslib"))
-        .arg("./configure")
-        .arg(format!("--prefix={}/local", home_dir().unwrap().into_os_string().into_string().unwrap()))
-        .status()
-        .unwrap()
-        .success()
-    {
-        panic!("failed to build htslib");
-    }
     let host = env::var("HOST").unwrap_or_default();
     // autoreconf & ./configure (with no args) steps are necessary to include the htslib plugins (hfile_s3.o, hfile_s3_writer.o, etc...)
     if  // cleanup first
@@ -139,6 +103,7 @@ fn main() {
         !Command::new("./configure")
         .current_dir(out.join("htslib"))
         .arg("install")
+        .arg(format!("--prefix={}/local", home_dir().unwrap().into_os_string().into_string().unwrap()))
         .env("CFLAGS", &cc_cflags)
         .arg(format!("--host={}", &host))
         .status().unwrap().success()