summaryrefslogtreecommitdiff
path: root/tools/prj
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-04-29 17:09:55 +0200
committerMichael Stahl <mst@openoffice.org>2010-04-29 17:09:55 +0200
commitccecaf93b3d1c85a8c5a3b3be2adfeb5fed7dfc8 (patch)
tree63906b5b86a10762f72c765933c802fb92a919c3 /tools/prj
parent1c4f220b470e3887ef3f04974b805c7641e593e2 (diff)
gnumake2: tools: support for SYSTEM_ZLIB not LINUX specific
Diffstat (limited to 'tools/prj')
-rw-r--r--tools/prj/target_lib_tl.mk15
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk
index 65a48316d914..30c64badc265 100644
--- a/tools/prj/target_lib_tl.mk
+++ b/tools/prj/target_lib_tl.mk
@@ -126,12 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
))
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,tl,\
- dl \
- m \
- pthread \
-))
ifeq ($(SYSTEM_ZLIB),YES)
$(eval $(call gb_Library_set_cxxflags,tl,\
$$(CXXFLAGS) \
@@ -145,9 +139,12 @@ $(eval $(call gb_Library_add_linked_static_libs,tl,\
zlib \
))
endif
-else
-$(eval $(call gb_Library_add_linked_static_libs,tl,\
- zlib \
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,tl,\
+ dl \
+ m \
+ pthread \
))
endif