Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Zircon version in fuchsia toolchain build #53480

Closed
wants to merge 1 commit into from
Closed

Update Zircon version in fuchsia toolchain build #53480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/ci/docker/dist-various-2/build-fuchsia-toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
set -ex
source shared.sh

ZIRCON=e9a26dbc70d631029f8ee9763103910b7e3a2fe1
ZIRCON=1e827755b8b48bb5029e3c7cf2ea9ced9c8f8e1d

mkdir -p zircon
pushd zircon > /dev/null
Expand All @@ -26,16 +26,19 @@ git fetch --depth=1 origin $ZIRCON
git reset --hard FETCH_HEAD

# Download toolchain
./scripts/download-toolchain
chmod -R a+rx prebuilt/downloads/clang+llvm-x86_64-linux
cp -a prebuilt/downloads/clang+llvm-x86_64-linux/. /usr/local
./scripts/download-prebuilt
chmod -R a+rx prebuilt/downloads/clang
cp -a prebuilt/downloads/clang/. /usr/local
if ! which python > /dev/null; then
ln -s `which python2.7` /usr/local/bin/python
fi

build() {
local arch="$1"

case "${arch}" in
x86_64) tgt="zircon-pc-x86-64" ;;
aarch64) tgt="zircon-qemu-arm64" ;;
x86_64) tgt="x64" ;;
aarch64) tgt="arm64" ;;
esac

hide_output make -j$(getconf _NPROCESSORS_ONLN) $tgt
Expand Down