Merge "Fix paths rbc-run uses to access the rbc tools."
This commit is contained in:
@@ -5,25 +5,12 @@
|
|||||||
[[ $# -gt 0 && -f "$1" ]] || { echo "Usage: ${0##*/} product.mk [Additional rbcrun arguments]" >&2; exit 1; }
|
[[ $# -gt 0 && -f "$1" ]] || { echo "Usage: ${0##*/} product.mk [Additional rbcrun arguments]" >&2; exit 1; }
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
case $(uname -s) in
|
|
||||||
Linux)
|
|
||||||
declare -r os="linux-x86";
|
|
||||||
;;
|
|
||||||
Darwin)
|
|
||||||
declare -r os="darwin-x86";
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unknown OS: $(uname -s)" >&2;
|
|
||||||
exit 1;
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
declare -r output_root="${OUT_DIR:-out}"
|
declare -r output_root="${OUT_DIR:-out}"
|
||||||
declare -r runner="${output_root}/soong/host/${os}/bin/rbcrun"
|
declare -r runner="${output_root}/soong/rbcrun"
|
||||||
declare -r converter="${output_root}/soong/host/${os}/bin/mk2rbc"
|
declare -r converter="${output_root}/soong/mk2rbc"
|
||||||
declare -r launcher="$output_root/launchers/run.rbc"
|
declare -r launcher="${output_root}/launchers/run.rbc"
|
||||||
declare -r makefile="$1"
|
declare -r makefile="$1"
|
||||||
shift
|
shift
|
||||||
"$converter" -mode=write -r --outdir "$output_root" --launcher="$launcher" "$makefile"
|
"${converter}" -mode=write -r --outdir "${output_root}" --launcher="${launcher}" "${makefile}"
|
||||||
"$runner" RBC_OUT="make,global" RBC_DEBUG="${RBC_DEBUG:-}" $@ "$launcher"
|
"${runner}" RBC_OUT="make,global" RBC_DEBUG="${RBC_DEBUG:-}" $@ "${launcher}"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user