Skip to content

Commit

Permalink
Convert the bootstrap system to using improved host platform detection.
Browse files Browse the repository at this point in the history
Part of bazelbuild#6849.

Closes bazelbuild#9051.

PiperOrigin-RevId: 261196683
  • Loading branch information
katre authored and copybara-github committed Aug 1, 2019
1 parent d433a5f commit 00f8d65
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ source scripts/bootstrap/bootstrap.sh
new_step 'Building Bazel with Bazel'
display "."
log "Building output/bazel"
# We set host and target platform directly since the defaults in @bazel_tools
# have not yet been generated.
# We set host and target platform directly because we are building for the local
# host.
bazel_build "src:bazel_nojdk${EXE_EXT}" \
--action_env=PATH \
--host_platform=@bazel_tools//platforms:host_platform \
--platforms=@bazel_tools//platforms:target_platform \
--host_platform=@local_config_platform//:host \
--platforms=@local_config_platform//:host \
|| fail "Could not build Bazel"
bazel_bin_path="$(get_bazel_bin_path)/src/bazel_nojdk${EXE_EXT}"
[ -e "$bazel_bin_path" ] \
Expand Down
1 change: 1 addition & 0 deletions scripts/bootstrap/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ EOF
cat <<EOF >${OUTPUT_DIR}/classes/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE
local_repository(name = 'bazel_tools', path = '${BAZEL_TOOLS_REPO}')
bind(name = "cc_toolchain", actual = "@bazel_tools//tools/cpp:default-toolchain")
local_config_platform(name = 'local_config_platform')
EOF

create_deploy_jar "libblaze" "com.google.devtools.build.lib.bazel.Bazel" \
Expand Down

0 comments on commit 00f8d65

Please sign in to comment.