Skip to content

Commit

Permalink
Fix build system breakage
Browse files Browse the repository at this point in the history
  • Loading branch information
milot-mirdita committed Jan 7, 2025
1 parent 9927445 commit 5140ceb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
12 changes: 9 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ task:
echo "deb [trusted=yes] http://archive.debian.org/debian jessie main" > /etc/apt/sources.list
echo "deb [trusted=yes] http://archive.debian.org/debian-security jessie/updates main" >> /etc/apt/sources.list
apt-get update --yes --force-yes || true
apt-get install cmake clang-4.0 libc++-dev make git ca-certificates --yes --force-yes --no-install-suggests --no-install-recommends
apt-get install clang-4.0 libc++-dev make git ca-certificates --yes --force-yes --no-install-suggests --no-install-recommends
wget https://github.com/Kitware/CMake/releases/download/v3.31.0/cmake-3.31.0-linux-x86_64.sh
chmod +x cmake-3.31.0-linux-x86_64.sh
./cmake-3.31.0-linux-x86_64.sh --skip-license --prefix=/usr/local
env:
CC: clang-4.0
CXX: clang++-4.0
Expand All @@ -33,13 +36,16 @@ task:
echo "deb [trusted=yes] http://archive.debian.org/debian jessie main" > /etc/apt/sources.list
echo "deb [trusted=yes] http://archive.debian.org/debian-security jessie/updates main" >> /etc/apt/sources.list
apt-get update --yes --force-yes || true
apt-get install cmake gcc-4.9 g++-4.9 make git ca-certificates --yes --force-yes --no-install-suggests --no-install-recommends
apt-get install gcc-4.9 g++-4.9 make git ca-certificates --yes --force-yes --no-install-suggests --no-install-recommends
wget https://github.com/Kitware/CMake/releases/download/v3.31.0/cmake-3.31.0-linux-x86_64.sh
chmod +x cmake-3.31.0-linux-x86_64.sh
./cmake-3.31.0-linux-x86_64.sh --skip-license --prefix=/usr/local
env:
CC: gcc-4.9
CXX: g++-4.9
compile_script: |
mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -DHAVE_TESTS=1 -DENABLE_WERROR=0 -DHAVE_SSE4_1=1 -DREQUIRE_OPENMP=0 ..
/usr/local/bin/cmake -DCMAKE_BUILD_TYPE=Release -DHAVE_TESTS=1 -DENABLE_WERROR=0 -DHAVE_SSE4_1=1 -DREQUIRE_OPENMP=0 ..
make -j $(nproc --all)
test_script: MMSEQS_NUM_THREADS=4 ./util/regression/run_regression.sh ./build/src/mmseqs SCRATCH SEARCH

6 changes: 1 addition & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,7 @@ jobs:
displayName: Install Toolchain
- script: |
mkdir build && cd build
if [ "${ARCH}" = "ppc64el" ]; then
LIBGOMP=/usr/lib/gcc-cross/powerpc64-linux-gnu/9;
else
LIBGOMP=/usr/lib/gcc-cross/${CPREF}-linux-gnu/9;
fi
LIBGOMP=/usr/lib/gcc-cross/${CPREF}-linux-gnu/9;
CC=${CPREF}-linux-gnu-gcc CXX=${CPREF}-linux-gnu-g++ \
cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DHAVE_TESTS=1 -DFORCE_STATIC_DEPS=1 \
-DOpenMP_C_FLAGS="-fopenmp -I${LIBGOMP}" -DOpenMP_C_LIB_NAMES=gomp -DOpenMP_CXX_FLAGS="-fopenmp -I${LIBGOMP}" -DOpenMP_CXX_LIB_NAMES=gomp -DOpenMP_gomp_LIBRARY=${LIBGOMP}/libgomp.a \
Expand Down

0 comments on commit 5140ceb

Please sign in to comment.