Skip to content

Commit

Permalink
Use lld-9 to avoid reverting commit
Browse files Browse the repository at this point in the history
  • Loading branch information
ta264 committed Apr 26, 2022
1 parent 4b0474c commit 83940c3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt-get update && \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \
apt-get update && \
apt-get install -y cmake llvm-9 clang-9 autoconf automake libtool build-essential python curl git lldb-6.0 liblldb-6.0-dev libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev libssl-dev libnuma-dev libkrb5-dev zlib1g-dev debootstrap qemu-user-static locales && \
apt-get install -y cmake llvm-9 lld-9 clang-9 autoconf automake libtool build-essential python curl git lldb-6.0 liblldb-6.0-dev libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev libssl-dev libnuma-dev libkrb5-dev zlib1g-dev debootstrap qemu-user-static locales && \
locale-gen "en_US.UTF-8"

RUN mkdir /tmp/x86 /crossrootfs && \
Expand Down
2 changes: 0 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ stages:
git -C runtime tag | grep ${{ parameters.runtimeBranch }} | xargs git -C runtime checkout
git -C runtime apply ../dotnet-linux-x86/patches/runtime/0001-Fix-duplicate-definition-of-_RUNTIME_FUNCTION-on-lin.patch
git -C runtime cherry-pick -n d22aceff4b4b83672cfaaab92d9977445213f9f5
git -C runtime revert -n eb8460fd29f
sed -i 's/return/__SkipCrossArchBuild=0/' runtime/src/coreclr/build-runtime.sh
sed -i '/AppHostRuntimeIdentifier/d' runtime/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
sed -i '/\/dnceng\/internal\//d' runtime/NuGet.config
Expand Down

0 comments on commit 83940c3

Please sign in to comment.