[Libreoffice-commits] core.git: vcl/Library_vcl.mk

Rene Engelhard (via logerrit) logerrit at kemper.freedesktop.org
Wed Nov 6 12:33:14 UTC 2019


 vcl/Library_vcl.mk |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5e73b07c36ec1e40337075b93207c438d49ca565
Author:     Rene Engelhard <rene at debian.org>
AuthorDate: Wed Nov 6 07:15:51 2019 +0100
Commit:     Rene Engelhard <rene at debian.org>
CommitDate: Wed Nov 6 13:31:58 2019 +0100

    fix --disable-gui build on 32bit (missing -ldl)
    
    Change-Id: I66cd04efe5486459d9cc777a532925d25fbd1e86
    Reviewed-on: https://gerrit.libreoffice.org/82118
    Tested-by: Jenkins
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 00b98cdb2929..38bce206f72f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -543,6 +543,12 @@ $(eval $(call gb_Library_use_externals,vcl,\
 ))
 endif
 
+ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
+$(eval $(call gb_Library_add_libs,vcl,\
+    -lm $(DLOPEN_LIBS) \
+))
+endif
+
 ifeq ($(DISABLE_GUI),TRUE)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/unx/generic/printer/jobdata \
@@ -585,7 +591,6 @@ endif
 
 ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
 $(eval $(call gb_Library_add_libs,vcl,\
-    -lm $(DLOPEN_LIBS) \
     -lX11 \
     -lXext \
 ))


More information about the Libreoffice-commits mailing list