From 165e3040ffd3973e4077a575c368e40f83101a65 Mon Sep 17 00:00:00 2001
From: Fabian Schuiki <fabian@schuiki.ch>
Date: Wed, 24 Nov 2021 15:14:43 +0100
Subject: [PATCH] mlir: Point CI build to install directories instead of build

---
 .github/build-circt.sh   | 4 ++--
 .github/workflows/ci.yml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/build-circt.sh b/.github/build-circt.sh
index 097cd549d..9758fd99a 100755
--- a/.github/build-circt.sh
+++ b/.github/build-circt.sh
@@ -7,8 +7,8 @@ cd circt/build
 cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=../install \
-    -DMLIR_DIR=$PWD/../llvm/build/lib/cmake/mlir \
-    -DLLVM_DIR=$PWD/../llvm/build/lib/cmake/llvm \
+    -DMLIR_DIR=$PWD/../llvm/install/lib/cmake/mlir \
+    -DLLVM_DIR=$PWD/../llvm/install/lib/cmake/llvm \
     -DLLVM_ENABLE_ASSERTIONS=ON
 
 cmake --build . --target install -- -j$(nproc)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3954c28cf..15858557a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,9 @@ jobs:
         id: env
         run: |
           echo "CIRCT_SYS_CIRCT_DIR=$GITHUB_WORKSPACE/circt" >> $GITHUB_ENV
+          echo "CIRCT_SYS_CIRCT_BUILD_DIR=$GITHUB_WORKSPACE/circt/install" >> $GITHUB_ENV
+          echo "CIRCT_SYS_LLVM_DIR=$GITHUB_WORKSPACE/circt/llvm" >> $GITHUB_ENV
+          echo "CIRCT_SYS_LLVM_BUILD_DIR=$GITHUB_WORKSPACE/circt/llvm/install" >> $GITHUB_ENV
           echo "::set-output name=circt-hash::$(git rev-parse @:./circt)"
           echo "::set-output name=llvm-hash::$(cd circt && git rev-parse @:./llvm)"