Clean-up build_flang.yml

michalpasztamobica · Oct 12, 2020 · 959859f · 959859f
1 parent 9f7f6f4
commit 959859f
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/.github/workflows/build_flang.yml b/.github/workflows/build_flang.yml
@@ -16,14 +16,6 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
       - uses: actions/checkout@v2
-
-      - name: Clean up clang and llvm versions available
-        run: |
-          # clean-up existing clang and llvm versions
-          sudo apt purge clang-10 clangd-10 lld-10 lldb-10 llvm-10
-          sudo apt purge clang-8 clangd-8 lld-8 lldb-8 llvm-8
-          sudo update-alternatives --verbose --install /usr/bin/clang clang /usr/bin/clang-9 10
-          sudo update-alternatives --verbose --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 10
 
       - name: Download artifacts from build_dependencies job
         run: |
@@ -80,7 +72,7 @@ jobs:
           CMAKE_OPTIONS="-DLLVM_TARGETS_TO_BUILD=${{ matrix.target }}"
           cd runtime/libpgmath
           mkdir -p build && cd build
-          cmake $CMAKE_OPTIONS -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ ..
+          cmake $CMAKE_OPTIONS -DCMAKE_C_COMPILER=/usr/bin/gcc-9 -DCMAKE_CXX_COMPILER=/usr/bin/g++-9 ..
           make -j$(nproc)
           sudo make install
           
@@ -89,8 +81,8 @@ jobs:
           CMAKE_OPTIONS="-DLLVM_TARGETS_TO_BUILD=${{ matrix.target }}"
           mkdir -p build && cd build
           cmake $CMAKE_OPTIONS \
-          -DCMAKE_C_COMPILER=/usr/bin/gcc \
-          -DCMAKE_CXX_COMPILER=/usr/bin/g++ \
+          -DCMAKE_C_COMPILER=/usr/bin/gcc-9 \
+          -DCMAKE_CXX_COMPILER=/usr/bin/g++-9 \
           -DCMAKE_Fortran_COMPILER=/usr/local/bin/flang ..
           make -j$(nproc)
           sudo make install