Skip to content

Commit 43e1cd6

Browse files
authored
cxx: fix build with CARGO_TARGET_DIR set (#2542)
Fixes #2335.
1 parent 4218c95 commit 43e1cd6

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

third_party/cxx/blobstore/build.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
fn main() {
2+
// Find target directory, either from CARGO_TARGET_DIR or in-tree if unset.
3+
let mut src_dir = std::env::var_os("CARGO_TARGET_DIR").unwrap_or("../../../target".into());
4+
src_dir.push("/cxxbridge/demo/src");
5+
26
cxx_build::bridge("src/main.rs")
37
.file("src/blobstore.cc")
48
.flag_if_supported("-std=c++14")
59
.include(".")
6-
.include("../../../target/cxxbridge/demo/src")
10+
.include(src_dir)
711
.compile("cxxbridge-demo");
812

913
println!("cargo:rerun-if-changed=src/main.rs");

0 commit comments

Comments
 (0)