Skip to content

Commit 5140ceb

Browse files
committed
Fix build system breakage
1 parent 9927445 commit 5140ceb

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Diff for: .cirrus.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ task:
2424
echo "deb [trusted=yes] http://archive.debian.org/debian jessie main" > /etc/apt/sources.list
2525
echo "deb [trusted=yes] http://archive.debian.org/debian-security jessie/updates main" >> /etc/apt/sources.list
2626
apt-get update --yes --force-yes || true
27-
apt-get install cmake clang-4.0 libc++-dev make git ca-certificates --yes --force-yes --no-install-suggests --no-install-recommends
27+
apt-get install clang-4.0 libc++-dev make git ca-certificates --yes --force-yes --no-install-suggests --no-install-recommends
28+
wget https://github.com/Kitware/CMake/releases/download/v3.31.0/cmake-3.31.0-linux-x86_64.sh
29+
chmod +x cmake-3.31.0-linux-x86_64.sh
30+
./cmake-3.31.0-linux-x86_64.sh --skip-license --prefix=/usr/local
2831
env:
2932
CC: clang-4.0
3033
CXX: clang++-4.0
@@ -33,13 +36,16 @@ task:
3336
echo "deb [trusted=yes] http://archive.debian.org/debian jessie main" > /etc/apt/sources.list
3437
echo "deb [trusted=yes] http://archive.debian.org/debian-security jessie/updates main" >> /etc/apt/sources.list
3538
apt-get update --yes --force-yes || true
36-
apt-get install cmake gcc-4.9 g++-4.9 make git ca-certificates --yes --force-yes --no-install-suggests --no-install-recommends
39+
apt-get install gcc-4.9 g++-4.9 make git ca-certificates --yes --force-yes --no-install-suggests --no-install-recommends
40+
wget https://github.com/Kitware/CMake/releases/download/v3.31.0/cmake-3.31.0-linux-x86_64.sh
41+
chmod +x cmake-3.31.0-linux-x86_64.sh
42+
./cmake-3.31.0-linux-x86_64.sh --skip-license --prefix=/usr/local
3743
env:
3844
CC: gcc-4.9
3945
CXX: g++-4.9
4046
compile_script: |
4147
mkdir build && cd build
42-
cmake -DCMAKE_BUILD_TYPE=Release -DHAVE_TESTS=1 -DENABLE_WERROR=0 -DHAVE_SSE4_1=1 -DREQUIRE_OPENMP=0 ..
48+
/usr/local/bin/cmake -DCMAKE_BUILD_TYPE=Release -DHAVE_TESTS=1 -DENABLE_WERROR=0 -DHAVE_SSE4_1=1 -DREQUIRE_OPENMP=0 ..
4349
make -j $(nproc --all)
4450
test_script: MMSEQS_NUM_THREADS=4 ./util/regression/run_regression.sh ./build/src/mmseqs SCRATCH SEARCH
4551

Diff for: azure-pipelines.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,7 @@ jobs:
206206
displayName: Install Toolchain
207207
- script: |
208208
mkdir build && cd build
209-
if [ "${ARCH}" = "ppc64el" ]; then
210-
LIBGOMP=/usr/lib/gcc-cross/powerpc64-linux-gnu/9;
211-
else
212-
LIBGOMP=/usr/lib/gcc-cross/${CPREF}-linux-gnu/9;
213-
fi
209+
LIBGOMP=/usr/lib/gcc-cross/${CPREF}-linux-gnu/9;
214210
CC=${CPREF}-linux-gnu-gcc CXX=${CPREF}-linux-gnu-g++ \
215211
cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DHAVE_TESTS=1 -DFORCE_STATIC_DEPS=1 \
216212
-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 \

0 commit comments

Comments
 (0)