cxx: fix build with CARGO_TARGET_DIR set #2542
Conversation
Alright, I had honestly no idea what we had customized the build file 😄 Thanks a lot for improving it, I only think we should add a comment explaining what this does. |
third_party/cxx/blobstore/build.rs
Outdated
| @@ -1,9 +1,16 @@ | |||
| fn main() { | |||
| let src_dir = { | |||
There was a problem hiding this comment.
| let src_dir = { | |
| // Handle $CARGO_TARGET_DIR being set. | |
| let src_dir = { |
There was a problem hiding this comment.
Looking at this, you could consider writing it more directly as
// Handle $CARGO_TARGET_DIR being set.
let mut src_dir = std::env::var_os("CARGO_TARGET_DIR").unwrap_or("../../../target".into());
src_dir.push("/cxxbridge/demo/src");Also, do you know how this relates to the $OUT_DIR variable which Cargo sets?
There was a problem hiding this comment.
Done.
As I understand it, $OUT_DIR refers to a temporary directory, and is an output of Cargo; $CARGO_TARGET_DIR is an input to Cargo and might change what $OUT_DIR ends up being (but I'm not sure, I don't touch build scripts often... unless they break).
fw-immunant
force-pushed
the
fw/cargo-target-dir
branch
from
6136169 to
bd8d070
Compare
Fixes #2335. This
build.rsfile is already ours rather than matching the upstream one, so I think further changes are fine--stop me if not!