diff options
author | Laszlo Csomor <laszlocsomor@google.com> | 2016-09-27 13:07:43 +0000 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2016-09-27 14:58:17 +0000 |
commit | 9f7180fc5211f9c381a57a940975390c825a7d90 (patch) | |
tree | 8cc06362fa862d3ccce8b994eca8b66f03902efb /scripts/bootstrap/buildenv.sh | |
parent | bb5901ba0474eb2ddd035502663026bcb0c05b7c (diff) |
Bootstrapping: don't use convenience symlinks
When `compile.sh` builds bazel using bazel, it
copies the resulting binary to `output/bazel`.
However sometimes the convenience symlink
`bazel-bin` is not created, probably because an
old one is still around and cannot be deleted.
That is clearly a bug, but to work around it, the
bootstrap builder shouldn't attempt to rely on the
creation of these symlinks in the first place.
This change updates compile.sh to use `bazel info`
to locate the `bazel-bin` directory's real path,
and attempt to copy the bazel binary from there.
This works around
https://github.com/bazelbuild/bazel/issues/1827
--
MOS_MIGRATED_REVID=134398451
Diffstat (limited to 'scripts/bootstrap/buildenv.sh')
-rwxr-xr-x | scripts/bootstrap/buildenv.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/bootstrap/buildenv.sh b/scripts/bootstrap/buildenv.sh index ebcf9429ac..4a946878c2 100755 --- a/scripts/bootstrap/buildenv.sh +++ b/scripts/bootstrap/buildenv.sh @@ -158,7 +158,7 @@ function fail() { exitCode=1 fi echo >&2 - echo "$@" >&2 + echo "ERROR: $@" >&2 exit $exitCode } |