Skip to content

Commit 27821df

Browse files
Fix local build on mac (#99)
* Rename workflow and remove unneeded docs upload * Add clang args
1 parent 7bc8189 commit 27821df

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

.github/workflows/rust.yml renamed to .github/workflows/clippy_build_test.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,4 @@ jobs:
6565

6666
- name: UploadCoverage
6767
if: matrix.rust == 'nightly'
68-
run: make upload-coverage
69-
70-
- name: CheckDocsBuild
71-
if: matrix.os == 'ubuntu-latest' && matrix.rust == 'stable'
72-
run: make build-docs
73-
74-
# Only deploy docs once - from one matrix combination, and only when on master (i.e. post PR merge)
75-
- name: DeployDocsToGHPagesFromMaster
76-
uses: JamesIves/[email protected]
77-
if: matrix.os == 'ubuntu-latest' && matrix.rust == 'stable' && github.ref == 'refs/heads/master'
78-
with:
79-
branch: gh-pages
80-
folder: target/doc
68+
run: make upload-coverage

build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ fn main() {
66
let bindings = bindgen::builder()
77
.header_contents("libproc_rs.h", "#include <libproc.h>")
88
.layout_tests(false)
9+
.clang_args(&["-x", "c++"])
910
.generate()
1011
.expect("Failed to build libproc bindings");
1112

12-
let output_path = Path::new(&env::var("OUT_DIR").expect("OUT_DIR env var was not defined"))
13+
let output_path = Path::new(&env::var("OUT_DIR")
14+
.expect("OUT_DIR env var was not defined"))
1315
.join("osx_libproc_bindings.rs");
1416

1517
bindings

0 commit comments

Comments
 (0)