Skip to content

Commit aa05718

Browse files
resolve conflicts with #193
1 parent b151b44 commit aa05718

File tree

1 file changed

+1
-36
lines changed

1 file changed

+1
-36
lines changed

hts-sys/build.rs

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -79,42 +79,6 @@ fn main() {
7979
let tool = cfg.get_compiler();
8080
let (cc_path, cflags_env) = (tool.path(), tool.cflags_env());
8181
let cc_cflags = cflags_env.to_string_lossy().replace("-O0", "");
82-
if !Command::new("autoheader")
83-
.current_dir(out.join("htslib"))
84-
.status()
85-
.unwrap()
86-
.success()
87-
{
88-
panic!("failed to build htslib");
89-
}
90-
if !Command::new("autoconf")
91-
.current_dir(out.join("htslib"))
92-
.status()
93-
.unwrap()
94-
.success()
95-
{
96-
panic!("failed to build htslib");
97-
}
98-
if !Command::new("sh")
99-
.current_dir(out.join("htslib"))
100-
.arg("./configure")
101-
.arg(format!("CC=clang".to_string()))
102-
.status()
103-
.unwrap()
104-
.success()
105-
{
106-
panic!("failed to build htslib");
107-
}
108-
if !Command::new("sh")
109-
.current_dir(out.join("htslib"))
110-
.arg("./configure")
111-
.arg(format!("--prefix={}/local", home_dir().unwrap().into_os_string().into_string().unwrap()))
112-
.status()
113-
.unwrap()
114-
.success()
115-
{
116-
panic!("failed to build htslib");
117-
}
11882
let host = env::var("HOST").unwrap_or_default();
11983
// autoreconf & ./configure (with no args) steps are necessary to include the htslib plugins (hfile_s3.o, hfile_s3_writer.o, etc...)
12084
if // cleanup first
@@ -139,6 +103,7 @@ fn main() {
139103
!Command::new("./configure")
140104
.current_dir(out.join("htslib"))
141105
.arg("install")
106+
.arg(format!("--prefix={}/local", home_dir().unwrap().into_os_string().into_string().unwrap()))
142107
.env("CFLAGS", &cc_cflags)
143108
.arg(format!("--host={}", &host))
144109
.status().unwrap().success()

0 commit comments

Comments
 (0)