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 /vcl/Library_vcl.mk | |
| 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 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 010568ac8974..b54642feb18a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_custom_headers,vcl,\ )) $(eval $(call gb_Library_use_externals,vcl,\ - $(if $(filter LINUX MACOSX,$(OS)), \ + $(if $(filter LINUX MACOSX %BSD SOLARIS,$(OS)), \ curl) \ jpeg \ $(if $(filter-out IOS WNT,$(OS)), \ @@ -721,10 +721,9 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc)) endif -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,vcl,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ -lGL \ -lX11 \ |