Skip to content

Commit 8417e44

Browse files
[carry] Point os::util::ensure::built_binary_exists at Origin
When the Bash tooling relies on tools built out of Origin, it tries to build them from the Origin repository. This is not a great hack as it requires you to have Origin checked out still as a sister repository, but we need to do more thinking for this. Signed-off-by: Steve Kuznetsov <[email protected]>
1 parent fb06f47 commit 8417e44

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

hack/lib/util/ensure.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ function os::util::ensure::built_binary_exists() {
4545

4646
if ! os::util::find::built_binary "${binary}" >/dev/null 2>&1; then
4747
if [[ -z "${target}" ]]; then
48-
if [[ -d "${OS_ROOT}/cmd/${binary}" ]]; then
48+
if [[ -d "${OS_ROOT}/../origin/cmd/${binary}" ]]; then
4949
target="cmd/${binary}"
50-
elif [[ -d "${OS_ROOT}/tools/${binary}" ]]; then
50+
elif [[ -d "${OS_ROOT}/../origin/tools/${binary}" ]]; then
5151
target="tools/${binary}"
52-
elif [[ -d "${OS_ROOT}/tools/rebasehelpers/${binary}" ]]; then
52+
elif [[ -d "${OS_ROOT}/../origin/tools/rebasehelpers/${binary}" ]]; then
5353
target="tools/rebasehelpers/${binary}"
5454
fi
5555
fi
5656

5757
if [[ -n "${target}" ]]; then
5858
os::log::info "No compiled \`${binary}\` binary was found. Attempting to build one using:
5959
$ hack/build-go.sh ${target}"
60-
"${OS_ROOT}/hack/build-go.sh" "${target}"
60+
"${OS_ROOT}/../origin/hack/build-go.sh" "${target}"
6161
else
6262
os::log::fatal "No compiled \`${binary}\` binary was found and no build target could be determined.
6363
Provide the binary and try running $0 again."

0 commit comments

Comments
 (0)