Skip to content

Commit

Permalink
Change default location of solana.h to OUT_DIR (solana-labs#5389)
Browse files Browse the repository at this point in the history
automerge
  • Loading branch information
TristanDebrunner authored and solana-grimes committed Aug 1, 2019
1 parent 43cc9fc commit 97c0573
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion sdk-c/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ to generate a header file during the build. To generate both:

```shell
$ cd <path/to/solana/repo>/sdk-c
$ cargo build
$ SOLANA_H_OUT_DIR="$(pwd)/include" cargo build
```

This will generate the static library in `<path/to/solana/repo>/target/deps` and the header file in
Expand Down
11 changes: 8 additions & 3 deletions sdk-c/build.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
use std::env;
use std::fs;
use std::path::Path;
use std::path::{Path, PathBuf};

fn main() {
let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();

let out_path = Path::new(&crate_dir);
let out_path = out_path.join(Path::new("include"));
let out_path = if let Ok(path) = env::var("SOLANA_H_OUT_DIR") {
PathBuf::from(path)
} else {
let out_dir = env::var("OUT_DIR").unwrap();
let out_dir = Path::new(&out_dir);
out_dir.join(Path::new("include"))
};

// Ensure `out_path` exists
fs::create_dir_all(&out_path).unwrap_or_else(|err| {
Expand Down

0 comments on commit 97c0573

Please sign in to comment.