From 6f8ded79301807f6f1821ce036799237fbdfe1bd Mon Sep 17 00:00:00 2001 From: Adam Jacob Date: Mon, 14 Mar 2016 18:51:02 -0700 Subject: [PATCH] Build bldr from the component directory --- plans/bldr/plan.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/bldr/plan.sh b/plans/bldr/plan.sh index 0dc579abcd..efc655db4a 100644 --- a/plans/bldr/plan.sh +++ b/plans/bldr/plan.sh @@ -10,7 +10,7 @@ pkg_build_deps=(chef/coreutils chef/cacerts chef/rust chef/gcc) pkg_gpg_key=3853DA6B do_build() { - pushd $PLAN_CONTEXT > /dev/null + pushd $PLAN_CONTEXT/../../components/bldr > /dev/null cargo clean env OPENSSL_LIB_DIR=$(pkg_path_for chef/openssl)/lib \ OPENSSL_INCLUDE_DIR=$(pkg_path_for chef/openssl)/include \ @@ -24,7 +24,7 @@ do_build() { } do_install() { - install -v -D $PLAN_CONTEXT/../../target/debug/bldr $pkg_path/bin/bldr + install -v -D $PLAN_CONTEXT/../../components/bldr/target/debug/bldr $pkg_path/bin/bldr } # Turn the remaining default phases into no-ops