Skip to content

Commit bd7582f

Browse files
committed
Fix GCE
1 parent cd577f0 commit bd7582f

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

helper.fish

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2350,7 +2350,7 @@ end
23502350
function cleanWorkspace
23512351
if test -d $WORKDIR/work
23522352
pushd $WORKDIR/work
2353-
and find . -maxdepth 1 '!' "(" -name ArangoDB -o -name . -o -name .. -o -name ".cc*" -o -name "sourceInfo.*" ")" -exec rm -rf "{}" ";"
2353+
and find . -maxdepth 1 '!' "(" -name ArangoDB -o -name . -o -name .. -o -name ".cc*" -o -name "sourceInfo.*" -o -name ".gcs-credentials" ")" -exec rm -rf "{}" ";"
23542354
and popd
23552355
end
23562356
end

scripts/buildArangoDB312.fish

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env fish
2-
# This is for static gcc13.2.0 and clang16.0.6 builds on Ubuntu
2+
# This is for static gcc13.2.0 and clang19.1.7 builds on Ubuntu
33
source ./scripts/lib/build.fish
44

55
if test "$PARALLELISM" = ""

scripts/buildArangoDBDevel.fish

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env fish
2-
# This is for static gcc13.2.0 and clang16.0.6 builds on Ubuntu
2+
# This is for static gcc13.2.0 and clang19.1.7 builds on Ubuntu
33
source ./scripts/lib/build.fish
44

55
if test "$PARALLELISM" = ""
@@ -13,11 +13,11 @@ end
1313
echo "Using parallelism $PARALLELISM"
1414

1515
if test "$COMPILER_VERSION" = ""
16-
set -xg COMPILER_VERSION clang16.0.6
16+
set -xg COMPILER_VERSION clang19.1.7
1717
end
1818
echo "Using compiler version $COMPILER_VERSION"
1919

20-
if test "$COMPILER_VERSION" = "clang16.0.6"
20+
if test "$COMPILER_VERSION" = "clang19.1.7"
2121
set -xg CC_NAME clang
2222
set -xg CXX_NAME clang++
2323
else if test "$COMPILER_VERSION" = "13.2.0"
@@ -37,6 +37,14 @@ if test "$ARCH" = "x86_64" -a (string sub -s 1 -l 1 "$OPENSSLPATH") = "3"
3737
set -xg X86_64_SUFFIX "64"
3838
end
3939

40+
if test "$ARCH" = "x86_64"
41+
set -xg LAPACK_LIB_PATH "/usr/lib/x86_64-linux-gnu/lapack/liblapack.a"
42+
set -xg BLAS_LIB_PATH "/usr/lib/x86_64-linux-gnu/blas/libblas.a"
43+
else
44+
set -xg LAPACK_LIB_PATH "/usr/lib/aarch64-linux-gnu/lapack/liblapack.a"
45+
set -xg BLAS_LIB_PATH "/usr/lib/aarch64-linux-gnu/blas/libblas.a"
46+
end
47+
4048
set -l pie ""
4149

4250
if test "$STATIC_EXECUTABLES" = ""
@@ -53,15 +61,17 @@ set -g FULLARGS $argv \
5361
-DOPENSSL_ROOT_DIR=/opt \
5462
-DUSE_STRICT_OPENSSL_VERSION=$USE_STRICT_OPENSSL \
5563
-DBUILD_REPO_INFO=$BUILD_REPO_INFO \
56-
-DARANGODB_BUILD_DATE="$ARANGODB_BUILD_DATE"
64+
-DARANGODB_BUILD_DATE="$ARANGODB_BUILD_DATE" \
65+
-DLAPACK_LIBRARIES="$LAPACK_LIB_PATH" \
66+
-DBLAS_LIBRARIES="$BLAS_LIB_PATH"
5767

5868
if test "$MAINTAINER" = "On"
5969
set -g FULLARGS $FULLARGS \
60-
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id=sha1 $pie -fno-stack-protector -fuse-ld=lld" \
70+
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id=sha1 $pie -fno-stack-protector -fuse-ld=lld -fopenmp=libomp -L/opt/omp -llapack -lgfortran" \
6171
-DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld"
6272
else
6373
set -g FULLARGS $FULLARGS \
64-
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id=sha1 $pie $inline -fno-stack-protector -fuse-ld=lld " \
74+
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id=sha1 $pie $inline -fno-stack-protector -fuse-ld=lld -fopenmp=libomp -L/opt/omp -llapack -lgfortran" \
6575
-DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld" \
6676
-DUSE_CATCH_TESTS=Off \
6777
-DUSE_GOOGLE_TESTS=Off

0 commit comments

Comments
 (0)