From ec17239f46fa8677975183e0ab4a0bc7adcff77e Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 1 Nov 2018 06:06:55 +0100 Subject: 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. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 5d494adcb..a50ae3db4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - HOMEBREW_PATH=$HOME/homebrew/ - DENO_BUILD_ARGS="use_custom_libcxx=false use_sysroot=false" - DENO_BUILD_PATH=$HOME/out/Default - - CARGO_TARGET_DIR=$DENO_BUILD_PATH + - CARGO_TARGET_DIR=$HOME/target - DENO_BUILD_MODE=release - PATH=$TRAVIS_BUILD_DIR/third_party/llvm-build/Release+Asserts/bin:$CARGO_HOME/bin:$PATH - CCACHE_CPP2=yes -- cgit v1.2.3