test

matter-labs · Oct 21, 2024 · 76a47f9 · 76a47f9
1 parent 11be54a
commit 76a47f9
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/.github/actions/build-solc/action.yml b/.github/actions/build-solc/action.yml
@@ -56,34 +56,22 @@ runs:
         BOOST_VERSION: ${{ inputs.boost-version }}
       run: |
         set -x
+        BOOST_VERSION=${BOOST_VERSION//./_}
+        BOOST_ROOT="${PWD}/boost/lib/cmake/Boost-${BOOST_VERSION}"
+        BOOST_LIBDIR="${PWD}/boost/lib"
+        BOOST_INCLUDEDIR="${PWD}/boost/include"
+        BOOST_CMAKE_FLAGS="-DBoost_NO_BOOST_CMAKE=1 -DBoost_NO_SYSTEM_PATHS=1 -DBOOST_ROOT=${BOOST_ROOT} -DBOOST_LIBRARYDIR="${BOOST_LIBDIR}" -DBoost_USE_STATIC_RUNTIME=1 -DBOOST_USE_STATIC_LIBS=1 -DBOOST_INCLUDEDIR="${BOOST_INCLUDEDIR}" -DBoost_DEBUG=1"
         if [ ${RUNNER_OS} = macOS ]; then
           PARALLEL=$(sysctl -n hw.ncpu)
-          BOOST_VERSION=${BOOST_VERSION//./_}
-          BOOST_ROOT="${PWD}/boost/lib/cmake/Boost-${BOOST_VERSION}"
-          BOOST_LIBDIR="${PWD}/boost/lib"
-          BOOST_INCLUDEDIR="${PWD}/boost/include"
-          BOOST_CMAKE_FLAGS="-DBoost_NO_BOOST_CMAKE=1 -DBoost_NO_SYSTEM_PATHS=1 -DBOOST_ROOT=${BOOST_ROOT} -DBOOST_LIBRARYDIR="${BOOST_LIBDIR}" -DBoost_USE_STATIC_RUNTIME=1 -DBOOST_USE_STATIC_LIBS=1 -DBOOST_INCLUDEDIR="${BOOST_INCLUDEDIR}" -DBoost_DEBUG=1"
         else
           PARALLEL=$(nproc)
-        fi
-        if [ ${RUNNER_OS} = Linux ]; then
-          COMPILER_FLAGS="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS=-fuse-ld=lld"
-          PARALLEL=$(nproc)
-          BOOST_VERSION=${BOOST_VERSION//./_}
-          BOOST_ROOT="${PWD}/boost/lib/cmake/Boost-${BOOST_VERSION}"
-          BOOST_LIBDIR="${PWD}/boost/lib"
-          BOOST_INCLUDEDIR="${PWD}/boost/include"
-          BOOST_CMAKE_FLAGS="-DBoost_NO_BOOST_CMAKE=1 -DBoost_NO_SYSTEM_PATHS=1 -DBOOST_ROOT=${BOOST_ROOT} -DBOOST_LIBRARYDIR="${BOOST_LIBDIR}" -DBoost_USE_STATIC_RUNTIME=1 -DBOOST_USE_STATIC_LIBS=1 -DBOOST_INCLUDEDIR="${BOOST_INCLUDEDIR}" -DBoost_DEBUG=1"
+          COMPILER_FLAGS="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUSE_LD_GOLD=OFF -DCMAKE_CXX_FLAGS=-fuse-ld=lld"
         fi
         if [ ${RUNNER_OS} = Windows ]; then
-          COMPILER_FLAGS="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUSE_LD_GOLD=OFF -DCMAKE_CXX_FLAGS=-fuse-ld=lld"
           export LDFLAGS='-lbcrypt -lwsock32 -static'
-          BOOST_VERSION=${BOOST_VERSION//./_}
           BOOST_SHORT_VERSION=${BOOST_VERSION%??}
-          BOOST_ROOT="${PWD}/boost/lib/cmake/Boost-${BOOST_VERSION}"
-          BOOST_LIBDIR="${PWD}/boost/lib"
           BOOST_INCLUDEDIR="${PWD}/boost/include/boost-${BOOST_SHORT_VERSION}"
-          BOOST_CMAKE_FLAGS="-DBoost_COMPILER="-mgw14" -DBoost_ARCHITECTURE="-x64" -DBoost_NO_BOOST_CMAKE=1 -DBoost_NO_SYSTEM_PATHS=1 -DBOOST_ROOT=${BOOST_ROOT} -DBOOST_LIBRARYDIR="${BOOST_LIBDIR}" -DBOOST_USE_STATIC_RUNTIME=1 -DBOOST_USE_STATIC_LIBS=1 -DBOOST_INCLUDEDIR="${BOOST_INCLUDEDIR}" -DBoost_DEBUG=1"
+          BOOST_CMAKE_FLAGS="${BOOST_CMAKE_FLAGS} -DBoost_COMPILER=-mgw14 -DBoost_ARCHITECTURE=-x64 -DBOOST_INCLUDEDIR="${BOOST_INCLUDEDIR}""
         fi
         mkdir -p ./build
         cd ./build