vcl/Library_vcl.mk | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
New commits: commit 65cc20c6911bdbe0995691d6c3d0f5c772155d13 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Dec 8 11:14:09 2016 +0000 these link libs are present twice presumably should just be in non-disable-gui case Change-Id: I1f02437293bcfc958b0b755763fccd81af114859 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 759d903..7282cf8 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -617,16 +617,15 @@ else vcl/source/opengl/OpenGLHelper \ vcl/source/window/openglwin \ )) -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,vcl,\ - -lm \ - -ldl \ - -lpthread \ + -lm $(DLOPEN_LIBS) \ + -lpthread \ -lGL \ -lX11 \ + -lXext \ )) endif -endif ifeq ($(OS),ANDROID) $(eval $(call gb_Library_add_libs,vcl,\ @@ -721,14 +720,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc)) endif -ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -$(eval $(call gb_Library_add_libs,vcl,\ - -lm $(DLOPEN_LIBS) \ - -lpthread \ - -lGL \ - -lX11 \ - -lXext \ -)) ifneq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/opengl/x11/X11DeviceInfo \
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits