diff options
| author | Richard PALO <richard@NetBSD.org> | 2015-09-15 15:58:51 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-10-20 15:17:58 +0000 |
| commit | fd612a144c0028972513a18167a13d29326a1798 (patch) | |
| tree | 66208cb56cc22e7d7b942f029a46f3213bb3a1a2 /desktop | |
| parent | d42c3e0ddd9078c00de591b7470d73ad8a186cb1 (diff) | |
Add DLOPEN_LIBS to configure for some cases where -ldl is needed
use std::sqrt in vcldemo.cxx
Change-Id: I24d8ba15ee267d0cad3b063df9b7cfd8d284f4ee
Reviewed-on: https://gerrit.libreoffice.org/18591
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index df5cfb457150..1b8c5f7c214d 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -17,8 +17,8 @@ $(eval $(call gb_Library_set_include,sofficeapp,\ )) $(eval $(call gb_Library_add_libs,sofficeapp,\ - $(if $(filter $(OS),LINUX), \ - -ldl \ + $(if $(filter LINUX %BSD SOLARIS, $(OS)), \ + $(DLOPEN_LIBS) \ -lpthread \ ) \ )) @@ -99,19 +99,17 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ ifeq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Library_add_libs,sofficeapp,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ )) else -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_use_static_libraries,sofficeapp,\ glxtest \ )) $(eval $(call gb_Library_add_libs,sofficeapp,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ -lGL \ -lX11 \ |