From 58b82dbc4244cd6e009763cc9de0e7c11ae92701 Mon Sep 17 00:00:00 2001 From: RĂ¼diger Timm Date: Mon, 5 Sep 2005 08:07:54 +0000 Subject: 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 --- sal/util/makefile.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'sal/util') 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 -- cgit