diff options
| author | Adrian Cruceru <cruceruadrian@gmail.com> | 2020-06-25 12:01:02 +0200 |
|---|---|---|
| committer | Adrian Cruceru <cruceruadrian@gmail.com> | 2020-06-25 12:01:02 +0200 |
| commit | 343a9212b0421b5d81c15b2ef4ef0f02c19d2850 (patch) | |
| tree | dd3152c6361f6d64513b0f5e7d8705573b362f0a /src/ci/docker | |
| parent | f3b1582bb926a7005ba77bfaa44b1ed59a587509 (diff) | |
| download | rust-343a9212b0421b5d81c15b2ef4ef0f02c19d2850.tar.gz rust-343a9212b0421b5d81c15b2ef4ef0f02c19d2850.zip | |
Fix comments
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/dist-various-2/Dockerfile | 2 | ||||
| -rwxr-xr-x | src/ci/docker/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/ci/docker/dist-various-2/Dockerfile b/src/ci/docker/dist-various-2/Dockerfile index b495d8c2dae..208d45fa83f 100644 --- a/src/ci/docker/dist-various-2/Dockerfile +++ b/src/ci/docker/dist-various-2/Dockerfile @@ -73,7 +73,7 @@ COPY dist-various-2/x86_64-fortanix-unknown-sgx-clang-wrap.sh /usr/bin/x86_64-fo RUN ln -s /usr/bin/x86_64-fortanix-unknown-sgx-clang-11 /usr/bin/x86_64-fortanix-unknown-sgx-clang++-11 # We pass the commit id of the port of LLVM's libunwind to the build script. # Any update to the commit id here, should cause the container image to be re-built from this point on. -RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh "800f95131fe6acd20b96b6f4723ca3c820f3d379" +RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh COPY dist-various-2/build-wasi-toolchain.sh /tmp/ RUN /tmp/build-wasi-toolchain.sh diff --git a/src/ci/docker/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh b/src/ci/docker/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh index 46a0ca72909..78bf4527fef 100755 --- a/src/ci/docker/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh +++ b/src/ci/docker/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh @@ -3,14 +3,7 @@ set -eu source shared.sh -if [ -z "$1" ]; then - echo "Usage: ${0} <commit_id>" - exit -1 -fi - target="x86_64-fortanix-unknown-sgx" -url="https://github.com/fortanix/llvm-project/archive/${1}.tar.gz" -repo_name="llvm-project" install_prereq() { curl https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - |
