summaryrefslogtreecommitdiffstats
path: root/distro-configs
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-12-24 14:13:57 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2022-01-06 18:51:34 +0100
commit7df70a1cdcec43352e25fca9fdb5687bdb0616a6 (patch)
tree01924ec0b2f0e55bd2443bc5316266ecfd6393f9 /distro-configs
parentsw: fix too long inner borders intersecting with outer borders for Word cells (diff)
downloadcore-7df70a1cdcec43352e25fca9fdb5687bdb0616a6.tar.gz
core-7df70a1cdcec43352e25fca9fdb5687bdb0616a6.zip
Switch Linux Jenkins release build to mergelibs
Currently mergelibs errors just fails the later callgrind build, not early in Gerrit. Change-Id: I165f99fa819ea3d88b76089a5a0967731570d42a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127426 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'distro-configs')
-rw-r--r--distro-configs/Jenkins/linux_gcc_release_641
1 files changed, 1 insertions, 0 deletions
diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64
index 381ea68a0104..1c61522d4099 100644
--- a/distro-configs/Jenkins/linux_gcc_release_64
+++ b/distro-configs/Jenkins/linux_gcc_release_64
@@ -4,3 +4,4 @@ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++
--disable-dependency-tracking
--with-jdk-home=/etc/alternatives/java_sdk_11
--enable-odk
+--enable-mergelibs