summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2018-11-01 06:06:55 +0100
committerBert Belder <bertbelder@gmail.com>2018-11-01 14:18:18 +0100
commitec17239f46fa8677975183e0ab4a0bc7adcff77e (patch)
tree1e98707b971dde3e52094afee33b9f6e9ce7532e /src
parent67944f298c1fb64f69766fc6ee0269ea6b1efb75 (diff)
cargo: build in Cargo's out dir if DENO_BUILD_PATH is not set
Plus some minor improvements and clean-ups: * Resolve DENO_BUILD_PATH to an absolute path if necessary. * Rename DENO_BUILD_PATH to GN_OUT_DIR in places where it is supposed to be set by the build system (and not a user configuration variable). * Output Cargo `rerun-if-*-changed` instructions first, so even if the build itself fails, configuration changes will still trigger a re-run of build.rs. * Remove TODOs that are impossible. * Re-run build.rs when the flatbuffer definition file changes.
Diffstat (limited to 'src')
-rw-r--r--src/msg.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/msg.rs b/src/msg.rs
index 5c0244509..fcb10fff5 100644
--- a/src/msg.rs
+++ b/src/msg.rs
@@ -1,6 +1,6 @@
#![allow(unused_imports)]
#![allow(dead_code)]
use flatbuffers;
-// 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"));
+// GN_OUT_DIR is set either by build.rs (for the Cargo build), or by
+// build_extra/rust/run.py (for the GN+Ninja build).
+include!(concat!(env!("GN_OUT_DIR"), "/gen/msg_generated.rs"));