sal/Library_sal.mk | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 843ec0cfd2a96614faef640ad812af541d5cb335
Author: Tor Lillqvist <t...@collabora.com>
Date: Sun Apr 8 19:21:24 2018 +0300
While at it, combine the check for ANDROID with the ones for WNT and HAIKU
Also, order them alphabetically.
Change-Id: I144331d71455c1c794d300f9a4f4e2e21fcd5e1b
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index d6b6db9dedf9..41db5e910c65 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -57,10 +57,8 @@ $(eval $(call gb_Library_use_system_win32_libs,sal,\
))
$(eval $(call gb_Library_add_libs,sal,\
- $(if $(filter-out WNT HAIKU,$(OS)), \
- $(if $(filter $(OS),ANDROID),, \
- -lpthread \
- ) \
+ $(if $(filter-out ANDROID HAIKU WNT,$(OS)), \
+ -lpthread \
) \
$(if $(filter $(OS),LINUX), \
-ldl \
commit cd558bfba9005d6214c4a1a2e2564080022128b1
Author: Tor Lillqvist <t...@collabora.com>
Date: Sun Apr 8 19:17:20 2018 +0300
GNU Make's filter-out is hard to use
Change-Id: I99ec6176c0876b948e35880f02d54905d26e7280
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 0489e10a0e52..d6b6db9dedf9 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -57,7 +57,7 @@ $(eval $(call gb_Library_use_system_win32_libs,sal,\
))
$(eval $(call gb_Library_add_libs,sal,\
- $(if $(filter-out $(OS),WNT HAIKU), \
+ $(if $(filter-out WNT HAIKU,$(OS)), \
$(if $(filter $(OS),ANDROID),, \
-lpthread \
) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
