[Libreoffice-commits] core.git: Makefile.in

[Caolán McNamara (via logerrit)]

 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ecd3a095b33660f07f5361ead7e74530e7dadba
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 7 12:55:55 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Apr 7 15:01:10 2021 +0200

    skip check-if-root test if LIB_FUZZING_ENGINE is set
    
    https://github.com/google/oss-fuzz/pull/5588/checks?check_run_id=2285987092
    
    Where presubmit checks for oss-fuzz fail with
    Makefile:62: recipe for target 'check-if-root' failed
    despite the efforts made to detect running inside a container
    
    LIB_FUZZING_ENGINE is set by oss-fuzz which builds LibreOffice by
    calling bin/oss-fuzz-build.sh which uses
    distro-configs/LibreOfficeOssFuzz.conf that enables --enable-fuzzers and
    --enable-fuzzers ensures LIB_FUZZING_ENGINE is set, so checking for
    LIB_FUZZING_ENGINE seems a reasonable test here to skip the root check
    
    Change-Id: I930c87c13bd365b0adbefd3625598a89e48468ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113731
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index ac3334d6f9c8..23b4d4f17d90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ else # MAKE_RESTARTS
 .DEFAULT_GOAL := build
 
 check-if-root:
-	@if test ! `uname` = 'Haiku' -a `id -u` = 0 && test -z $$container && ! grep -q 'lxc\|docker' /proc/self/cgroup && ! grep -q 'libpod_parent' /proc/self/cgroup; then \
+	@if test ! `uname` = 'Haiku' -a `id -u` = 0 && test -z $$LIB_FUZZING_ENGINE && test -z $$container && ! grep -q 'lxc\|docker' /proc/self/cgroup && ! grep -q 'libpod_parent' /proc/self/cgroup; then \
 		echo; \
 		echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \
 		echo; \