File tree 1 file changed +9
-6
lines changed
src/ci/docker/dist-various-2
1 file changed +9
-6
lines changed Original file line number Diff line number Diff line change 14
14
set -ex
15
15
source shared.sh
16
16
17
- ZIRCON=e9a26dbc70d631029f8ee9763103910b7e3a2fe1
17
+ ZIRCON=1e827755b8b48bb5029e3c7cf2ea9ced9c8f8e1d
18
18
19
19
mkdir -p zircon
20
20
pushd zircon > /dev/null
@@ -26,16 +26,19 @@ git fetch --depth=1 origin $ZIRCON
26
26
git reset --hard FETCH_HEAD
27
27
28
28
# 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
32
35
33
36
build () {
34
37
local arch=" $1 "
35
38
36
39
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" ;;
39
42
esac
40
43
41
44
hide_output make -j$( getconf _NPROCESSORS_ONLN) $tgt
You can’t perform that action at this time.
0 commit comments