From 85bcdfdd3d182ddeb39fc25376e02c5867355d19 Mon Sep 17 00:00:00 2001 From: Jim Borden Date: Wed, 11 Dec 2024 08:15:25 +0900 Subject: [PATCH 1/2] CBL-6570: Copy correct libstdc++ into the package --- jenkins/build_server_unix.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/jenkins/build_server_unix.sh b/jenkins/build_server_unix.sh index 923393093..04aadc819 100755 --- a/jenkins/build_server_unix.sh +++ b/jenkins/build_server_unix.sh @@ -136,15 +136,18 @@ build_binaries () { # package up the strip symbols cp -rp ${project_dir}/libLiteCore.dylib.dSYM ./install/lib else + cxx=${CXX:-g++} + cc=${CC:-gcc} # copy C++ stdlib, etc to output - libstdcpp=`g++ --print-file-name=libstdc++.so` + echo "Copying libs from compiler" + libstdcpp=`$cxx --print-file-name=libstdc++.so` libstdcppname=`basename "$libstdcpp"` - libgcc_s=`gcc --print-file-name=libgcc_s.so` + libgcc_s=`$cc --print-file-name=libgcc_s.so` libgcc_sname=`basename "$libgcc_s"` - cp -p "$libstdcpp" "./install/lib/$libstdcppname" - ln -s "$libstdcppname" "./install/lib/${libstdcppname}.6" - cp -p "${libgcc_s}" "./install/lib" + cp -p "$libstdcpp" "./install/lib/$libstdcppname" -v + ln -s "$libstdcppname" "./install/lib/${libstdcppname}.6" -v + cp -p "${libgcc_s}" "./install/lib" -v fi if [[ -z ${SKIP_TESTS} ]] && [[ ${EDITION} == 'enterprise' ]]; then chmod 777 ${WORKSPACE}/couchbase-lite-core/build_cmake/scripts/test_unix.sh From 2275ca39a4c01017b9f229800fdc055abc5169a8 Mon Sep 17 00:00:00 2001 From: Jim Borden Date: Thu, 12 Dec 2024 10:38:59 +0900 Subject: [PATCH 2/2] Copy over better variant of libgcc_s --- jenkins/build_server_unix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/build_server_unix.sh b/jenkins/build_server_unix.sh index 04aadc819..185c37ad0 100755 --- a/jenkins/build_server_unix.sh +++ b/jenkins/build_server_unix.sh @@ -142,7 +142,7 @@ build_binaries () { echo "Copying libs from compiler" libstdcpp=`$cxx --print-file-name=libstdc++.so` libstdcppname=`basename "$libstdcpp"` - libgcc_s=`$cc --print-file-name=libgcc_s.so` + libgcc_s=`$cc --print-file-name=libgcc_s.so.1` libgcc_sname=`basename "$libgcc_s"` cp -p "$libstdcpp" "./install/lib/$libstdcppname" -v