Get circleci working

asyncvlsi · Jan 21, 2022 · 5b7de2c · 5b7de2c
1 parent fc888d4
commit 5b7de2c
Show file tree

Hide file tree

Showing 10 changed files with 1,419 additions and 39 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,14 +9,20 @@ jobs:
        - checkout
        - run: |
           apt-get -q update -y
-          apt-get -q install -y libedit-dev zlib1g-dev m4 build-essential
-          mkdir install
+          apt-get -q install -y libedit-dev zlib1g-dev m4 build-essential wget
+          wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-linux-x86_64.tar.gz
+          tar -xf cmake-3.22.1-linux-x86_64.tar.gz
+          export PATH="`pwd`/cmake-3.22.1-linux-x86_64/bin:$PATH"
           export VLSI_TOOLS_SRC=`pwd`
           export ACT_HOME=$VLSI_TOOLS_SRC/install
+          export LD_LIBRARY_PATH="$ACT_HOME/lib:$LD_LIBRARY_PATH"
+          mkdir $ACT_HOME
+          cp act/lang/HACK_expr.h act/lang/expr.h
+          cp act/lang/HACK_expr.c act/lang/expr.c
           ./configure $ACT_HOME
           ./build.sh 
           cmake --install build
-          ./test.py
+          ./test.sh
 
    centos8:
      docker:
@@ -26,14 +32,20 @@ jobs:
        - run: |
           yum install -y 'dnf-command(config-manager)'
           yum config-manager --set-enabled powertools -y
-          yum install -y gcc gcc-c++ diffutils make libedit-devel zlib-devel m4
-          mkdir install
+          yum install -y gcc gcc-c++ diffutils make libedit-devel zlib-devel m4 wget
+          wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-linux-x86_64.tar.gz
+          tar -xf cmake-3.22.1-linux-x86_64.tar.gz
+          export PATH="`pwd`/cmake-3.22.1-linux-x86_64/bin:$PATH"
           export VLSI_TOOLS_SRC=`pwd`
           export ACT_HOME=$VLSI_TOOLS_SRC/install
+          export LD_LIBRARY_PATH="$ACT_HOME/lib:$LD_LIBRARY_PATH"
+          mkdir $ACT_HOME
+          cp act/lang/HACK_expr.h act/lang/expr.h
+          cp act/lang/HACK_expr.c act/lang/expr.c
           ./configure $ACT_HOME
           ./build.sh
           cmake --install build
-          ./test.py
+          ./test.sh
           
 
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,6 @@ endif()
 include_directories(.)
 
 add_compile_options(-g -ubsanitizer=undefined -O2)
-add_link_options(-ldl)
 
 add_subdirectory(act)
 add_subdirectory(scripts)
diff --git a/act/lang/CMakeLists.txt b/act/lang/CMakeLists.txt
@@ -161,7 +161,7 @@ set(ACT_LANG_LIB_SOURCES
 add_library(ActLangLib STATIC ${ACT_LANG_LIB_SOURCES})
 add_dependencies(ActLangLib ActLangAutogen)
 set_target_properties(ActLangLib PROPERTIES OUTPUT_NAME act)
-target_link_libraries(ActLangLib ActCommonLib)
+target_link_libraries(ActLangLib ActCommonLib ${CMAKE_DL_LIBS})
 
 add_library(ActLangLibSh SHARED ${ACT_LANG_LIB_SOURCES})
 add_dependencies(ActLangLibSh ActLangAutogen)