Skip to content

Commit ffdb8ed

Browse files
authored
Merge pull request #116 from adrianherrera/bugfix/docker-fixes
docker: fixes for LLVM 10
2 parents 0f954a2 + fa3e5a0 commit ffdb8ed

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN apt-get install libboost-all-dev -y
2020

2121
# installing LLVM
2222
COPY utils/install-llvm.sh /usr/src/phasar/utils/install-llvm.sh
23-
RUN ./utils/install-llvm.sh $(nproc) . "/usr/local/" "llvmorg-9.0.0"
23+
RUN ./utils/install-llvm.sh $(nproc) . "/usr/local/" "llvmorg-10.0.0"
2424

2525
# installing wllvm
2626
RUN pip3 install wllvm

utils/install-llvm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ echo "Build the LLVM project"
3535
git checkout ${llvm_release}
3636
mkdir -p build
3737
cd build
38-
cmake -G "Unix Makefiles" -DLLVM_ENABLE_PROJECTS='clang;clang-tools-extra;libcxx;libcxxabi;libunwind;lld;lldb;compiler-rt;lld;polly;debuginfo-tests;openmp;parallel-libs' -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_CXX1Y=ON -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON -DBUILD_SHARED_LIBS=ON ../llvm
38+
cmake -G "Unix Makefiles" -DLLVM_ENABLE_PROJECTS='clang;clang-tools-extra;libcxx;libcxxabi;libunwind;lld;lldb;compiler-rt;lld;polly;debuginfo-tests;openmp;parallel-libs' -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_CXX1Y=ON -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON -DBUILD_SHARED_LIBS=ON -DLLVM_BUILD_EXAMPLES=Off -DLLVM_INCLUDE_EXAMPLES=Off -DLLVM_BUILD_TESTS=Off -DLLVM_INCLUDE_TESTS=Off ../llvm
3939
make -j${num_cores}
4040
# echo "Run all tests"
4141
# make -j3 check-all
4242
echo "Installing LLVM to ${dest_dir}"
43-
sudo cmake -DCMAKE_INSTALL_PREFIX=${dest_dir} -P cmake_install.cmake
43+
sudo cmake -DCMAKE_INSTALL_PREFIX=${dest_dir} -P cmake_install.cmake
4444
sudo ldconfig
4545
echo "Installed LLVM successfully."

0 commit comments

Comments
 (0)