Review comment. Replace OUT_DIR with DENO_BUILD_PATH

build.rs

@@ -22,9 +22,10 @@ fn main() {
   assert!(status.success());
 
   // These configurations must be outputted after tools/setup.py is run.
-  println!("cargo:rustc-env=OUT_DIR={}", deno_build_path);
   println!("cargo:rustc-link-search=native={}/obj", deno_build_path);
   println!("cargo:rustc-link-lib=static=deno_deps");
+  // TODO Remove this and only use OUT_DIR at some point.
+  println!("cargo:rustc-env=DENO_BUILD_PATH={}", deno_build_path);
 
   let status = Command::new("python")
     .env("DENO_BUILD_PATH", &deno_build_path)

build_extra/rust/run.py

@@ -5,6 +5,9 @@
 import sys
 import os
 
-os.environ["OUT_DIR"] = os.path.abspath(".")
-assert os.path.isdir(os.environ["OUT_DIR"])
+# TODO This is for src/msg.rs to know where to find msg_generated.rs
+# In the future we should use OUT_DIR here.
+os.environ["DENO_BUILD_PATH"] = os.path.abspath(".")
+assert os.path.isdir(os.environ["DENO_BUILD_PATH"])
+
 sys.exit(subprocess.call(sys.argv[1:], env=os.environ))

src/msg.rs

@@ -1,4 +1,6 @@
 #![allow(unused_imports)]
 #![allow(dead_code)]
 use flatbuffers;
-include!(concat!(env!("OUT_DIR"), "/gen/msg_generated.rs"));
+// TODO Replace DENO_BUILD_PATH with OUT_DIR. gn/ninja should generate into
+// the same output directory as cargo uses.
+include!(concat!(env!("DENO_BUILD_PATH"), "/gen/msg_generated.rs"));