Update ci.yml

compiler-research · Feb 9, 2024 · 9d60dd5 · 9d60dd5
1 parent b20072a
commit 9d60dd5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -238,7 +238,6 @@ jobs:
           # Now build gtest.a and gtest_main for CppInterOp to run its tests.
           cmake --build . --target gtest_main --parallel ${{ env.ncpus }}
           cd ../
-          mv build inst
         else
           mkdir inst
           # Apply patches
@@ -260,8 +259,8 @@ jobs:
           cmake --build . --target all --parallel ${{ env.ncpus }}
           cmake --build . --target install --parallel ${{ env.ncpus }}
           cd ..
+          rm -rf $(find . -maxdepth 1 ! -name "inst" ! -name ".")
         fi 
-        rm -rf $(find . -maxdepth 1 ! -name "inst" ! -name ".")
         cd ..
         
     - name: Save Cache LLVM/Clang runtime build directory
@@ -347,13 +346,15 @@ jobs:
         # Build CppInterOp next to cling and llvm-project.
 
         LLVM_DIR="$(pwd)/clang-dev"
-        LLVM_BUILD_DIR="$(pwd)/clang-dev/inst"
+        
         cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
         if [[ "${cling_on}" == "ON" ]]; then
+          LLVM_BUILD_DIR="$(pwd)/clang-dev/build"
           CLING_DIR="$(pwd)/cling"
           CLING_BUILD_DIR="$(pwd)/cling/build"
           CPLUS_INCLUDE_PATH="${CLING_DIR}/tools/cling/include:${CLING_BUILD_DIR}/include:${LLVM_DIR}/llvm/include:${LLVM_DIR}/clang/include:${LLVM_BUILD_DIR}/include:${LLVM_BUILD_DIR}/tools/clang/include:$PWD/include"
         else
+          LLVM_BUILD_DIR="$(pwd)/clang-dev/inst"
           CPLUS_INCLUDE_PATH="${LLVM_DIR}/llvm/include:${LLVM_DIR}/clang/include:${LLVM_BUILD_DIR}/include:${LLVM_BUILD_DIR}/tools/clang/include:$PWD/include"
         fi
         
@@ -371,8 +372,8 @@ jobs:
                 -DUSE_CLING=ON                                  \
                 -DUSE_REPL=OFF                                  \
                 -DCling_DIR=$LLVM_BUILD_DIR/tools/cling         \
-                -DLLVM_DIR=$LLVM_BUILD_DIR                      \
-                -DClang_DIR=$LLVM_BUILD_DIR                     \
+                -DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm       \
+                -DClang_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm      \
                 -DBUILD_SHARED_LIBS=ON                          \
                 -DCODE_COVERAGE=${{ env.CODE_COVERAGE }}        \
                 -DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR          \