Skip to content

Commit 0396e36

Browse files
committed
Update llvm version
Solang now depends on commit 9f8413319893 ("Make lld thread-safe with llvm") in https://github.com/seanyoung/llvm-project/ Signed-off-by: Sean Young <sean@mess.org>
1 parent c046e64 commit 0396e36

6 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Checkout sources
3838
uses: actions/checkout@v2
3939
- name: Download LLVM
40-
run: curl -sS -o c:\llvm.zip https://solang.io/download/llvm10.0.zip
40+
run: curl -sS -o c:\llvm.zip https://solang.io/download/llvm10.0-win.zip
4141
- name: Extract LLVM
4242
run: unzip c:\llvm.zip -d c:/
4343
- name: Add LLVM to Path

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Checkout sources
4040
uses: actions/checkout@v2
4141
- name: Download LLVM
42-
run: curl -sS -o c:\llvm.zip https://solang.io/download/llvm10.0.zip
42+
run: curl -sS -o c:\llvm.zip https://solang.io/download/llvm10.0-win.zip
4343
- name: Extract LLVM
4444
run: unzip c:\llvm.zip -d c:/
4545
- name: Add LLVM to Path

docs/installing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ Installing LLVM on Windows
102102
__________________________
103103

104104
A pre-built version of llvm, specifically configured for Solang, is available at
105-
`<https://solang.io/download/llvm10.0.zip>`_. This version is built using the
105+
`<https://solang.io/download/llvm10.0-win.zip>`_. This version is built using the
106106
`dockerfile for building llvm on Windows <https://github.com/hyperledger-labs/solang/blob/master/scripts/build-llvm-windows.dockerfile>`_.
107107

108108
If you want to use the dockerfile yourself rather than download the binaries above, then this
109109
requires `Docker Desktop <https://www.docker.com/products/docker-desktop>`_ and switch to
110110
`windows containers <https://docs.docker.com/docker-for-windows/#switch-between-windows-and-linux-containers>`_.
111-
Docker on Windows needs Hyper-V. The result will be an image with llvm compressed in ``c:\llvm10.0.zip``.
111+
Docker on Windows needs Hyper-V. The result will be an image with llvm compressed in ``c:\llvm10.0-win.zip``.
112112
If you are running Windows 10 in a virtual machine, be sure to check
113113
`this blog post <https://www.mess.org/2020/06/22/Hyper-V-in-KVM/>`_.
114114

scripts/build-llvm-linux.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ RUN cmake -G Ninja -DLLVM_ENABLE_ASSERTIONS=On -DLLVM_ENABLE_TERMINFO=Off \
1616

1717
RUN cmake --build . --target install
1818

19-
RUN tar jcf /llvm10.0.tar.bz2 /llvm10.0/
19+
RUN tar jcf /llvm10.0-linux.tar.bz2 /llvm10.0/

scripts/build-llvm-windows.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ RUN cmake --build build --target install
6767

6868
WORKDIR \
6969

70-
RUN Compress-Archive -Path C:\llvm10.0 -DestinationPath C:\llvm10.0.zip
70+
RUN Compress-Archive -Path C:\llvm10.0 -DestinationPath C:\llvm10.0-win.zip
7171

7272
RUN Remove-Item -Path \llvm-project,C:\TEMP -Recurse -Force

scripts/ci.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:18.04 as builder
22

3-
ENV DEBIAN_FRONTEND=noninteractive
43
RUN apt-get update
4+
ENV DEBIAN_FRONTEND=noninteractive
55
RUN apt-get install -y libz-dev pkg-config libssl-dev git cmake ninja-build gcc g++ python
66

77
RUN git clone --branch bpf --single-branch \

0 commit comments

Comments
 (0)