Skip to content

Commit 8886144

Browse files
committed
Merge branch 'pr/75'
2 parents 4c313f1 + cab28b0 commit 8886144

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/rust.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- "pr/*"
78
pull_request: {}
89

910
jobs:
@@ -23,7 +24,7 @@ jobs:
2324
runs-on: macos-10.15
2425
strategy:
2526
matrix:
26-
feature: ["intel-mkl"]
27+
feature: ["intel-mkl", "source"]
2728
steps:
2829
- uses: actions/checkout@v1
2930
- uses: actions-rs/cargo@v1

fftw-src/build.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,14 @@ fn download_archive_unix(out_dir: &Path) -> Fallible<()> {
9797
}
9898

9999
fn build_fftw(flags: &[&str], src_dir: &Path, out_dir: &Path) {
100-
run(Command::new("./configure")
101-
.arg("--with-pic")
102-
.arg("--enable-static")
103-
.arg(format!("--prefix={}", out_dir.display()))
104-
.args(flags)
105-
.current_dir(&src_dir));
100+
run(
101+
Command::new(fs::canonicalize(src_dir.join("configure")).unwrap())
102+
.arg("--with-pic")
103+
.arg("--enable-static")
104+
.arg(format!("--prefix={}", out_dir.display()))
105+
.args(flags)
106+
.current_dir(&src_dir),
107+
);
106108
run(Command::new("make")
107109
.arg(format!("-j{}", var("NUM_JOBS").unwrap()))
108110
.current_dir(&src_dir));

0 commit comments

Comments
 (0)