Skip to content

Commit 138f9f1

Browse files
author
James Tucker
committed
Update Zircon version in fuchsia toolchain build
1 parent f034141 commit 138f9f1

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/ci/docker/dist-various-2/build-fuchsia-toolchain.sh

+9-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
set -ex
1515
source shared.sh
1616

17-
ZIRCON=e9a26dbc70d631029f8ee9763103910b7e3a2fe1
17+
ZIRCON=1e827755b8b48bb5029e3c7cf2ea9ced9c8f8e1d
1818

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

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

3336
build() {
3437
local arch="$1"
3538

3639
case "${arch}" in
37-
x86_64) tgt="zircon-pc-x86-64" ;;
38-
aarch64) tgt="zircon-qemu-arm64" ;;
40+
x86_64) tgt="x64" ;;
41+
aarch64) tgt="arm64" ;;
3942
esac
4043

4144
hide_output make -j$(getconf _NPROCESSORS_ONLN) $tgt

0 commit comments

Comments
 (0)