summaryrefslogtreecommitdiff
path: root/sal/util
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-09-05 08:07:54 +0000
committerRüdiger Timm <rt@openoffice.org>2005-09-05 08:07:54 +0000
commit58b82dbc4244cd6e009763cc9de0e7c11ae92701 (patch)
tree62f8b6d786b52c37842ce267c546f080a0ea5dd1 /sal/util
parentd791c1ba42e9557daedaac205ea79a0d087514af (diff)
INTEGRATION: CWS hr18 (1.36.18); FILE MERGED
2005/08/10 12:28:06 hr 1.36.18.1: #i53108#: link sal against STLport (debugging) library if compiling with checking iterators
Diffstat (limited to 'sal/util')
-rw-r--r--sal/util/makefile.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 4ac937948594..373600a59b38 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.36 $
+# $Revision: 1.37 $
#
-# last change: $Author: obo $ $Date: 2005-06-17 09:32:21 $
+# last change: $Author: rt $ $Date: 2005-09-05 09:07:54 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -162,6 +162,12 @@ SHL1STDLIBS= -lexc
.ENDIF
.ENDIF # UNX
+# If we compile sal with STLport checking iterators
+# we need to link against the STLport
+.IF "$(USE_STLP_DEBUG)" != ""
+SHL1STDLIBS+=$(LIBSTLPORT)
+.ENDIF
+
#The irony that using the system STL instead of
#stlport requires that we link libsal with the
#LIBSTLPORT alias which is not required when using