From b1e4fecbb2e37c3e272ad9a1d5c26c15e49da1d8 Mon Sep 17 00:00:00 2001 From: ystyle Date: Tue, 14 Jul 2020 17:09:47 +0800 Subject: [PATCH] fix: Replace with the correct llvm path --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63028a66bf..556db434a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,11 @@ RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list && \ apt-get -y install zlib1g-dev libc6-dev-i386 lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z-dev libgl1-mesa-dev libxml2-utils xsltproc lib32z1-dev qemu g++-multilib gcc-multilib libglib2.0-dev libpixman-1-dev linux-libc-dev:i386 && \ apt-get -y install python3-paramiko python-paramiko python-jenkins python-requests python-xlwt && \ apt-get -y install gcc-5-aarch64-linux-gnu g++-5-aarch64-linux-gnu aria2 && \ - mkdir -p /tools/ninja /tools/gn && \ - cd /tools && \ + mkdir -p /tools/ninja /tools/gn +# 在国内请在run下面一行添加 +# export http_proxy=http://192.168.3.81:1081 && export https_proxy=http://192.168.3.81:1081 && \ +# 原因都懂的, 还有容器内别用127.0.0.1 +RUN cd /tools && \ curl -C - -LO http://releases.llvm.org/8.0.0/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz && \ curl -LO https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip && \ curl -L -o /tools/gn/gn https://archive.softwareheritage.org/browse/content/sha1_git:2dc0d5b26caef44f467de8120b26f8aad8b878be/raw/?filename=gn && \ @@ -29,7 +32,7 @@ WORKDIR /OpenArkCompiler RUN mkdir -p /OpenArkCompiler/tools /OpenArkCompiler/tools/gn && \ ln -s /tools/ninja /OpenArkCompiler/tools/ninja_1.9.0 && \ ln -s /tools/gn/gn /OpenArkCompiler/tools/gn/gn && \ - ln -s /tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04 /OpenArkCompiler/tools/clang_llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04 + ln -s /tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04 /OpenArkCompiler/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04 # compile RUN ["/bin/bash", "-c", "source build/envsetup.sh && make"] @@ -42,4 +45,4 @@ RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list && \ COPY --from=build-env /OpenArkCompiler/out /OpenArkCompiler VOLUME /OpenArkCompiler ENV PATH=/OpenArkCompiler/bin:$PATH -CMD maple -h \ No newline at end of file +CMD maple -h -- Gitee