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(-) 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 ice-5-0'>distro/cib/libreoffice-5-0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/bin
AgeCommit message (Expand)Author
2020-06-05Battle-harden ODF implementer notes scriptThorsten Behrens
2020-05-30bin: Add script to find missing asserts in export testsXisco Fauli
2020-05-24remove some unused definesNoel Grandin
2020-05-24remove some unused typedefsNoel Grandin
2020-05-14check-missing-unittests: Add xhtml, html and doc formatsXisco Fauli
2020-05-06add cross-checking script for ODF implementer notesThorsten Behrens
2020-04-29Remove tango icon theme, tdf#132022Rizal Muttaqin
2020-04-15bin: Add script to find missing unittests based on git logXisco Fauli
2020-04-15Related tdf#130778: New About dialogHeiko Tietze
2020-04-14Add libepubgenTor Lillqvist
2020-04-09Fix bin/upload_symbols.py against current crashreport serviceGuilhem Moulin
2020-04-09pyuno,*: kill Python 2 support with fireMichael Stahl
2020-03-09make SpinField DLLPUBLIC againNoel Grandin
2020-03-06mark some more classes hidden in --enable-mergelibs modeNoel Grandin
2020-03-06symstore.sh: add vorbose modeJuergen Funk
2020-03-06limit symbols exported when using --enable-mergelibsNoel Grandin
2020-03-05bin: remove unused wiki tag in scriptXisco Fauli
2020-03-04make some symbols privateNoel Grandin
2020-03-03remove some dead codeNoel Grandin
2020-03-01gla11y: Fix checking orphan labelsSamuel Thibault
2020-02-24boost: disable -Wmaybe-uninitialized from GCC 9.2.1 -OgMichael Stahl
2020-02-21Drop o3tl::optional wrapperStephan Bergmann
2020-02-14Optionally generate PDBs also for nssJuergen Funk
2020-02-13find-unneeded-includes: silence broken o3tl::optional -> std::optional proposalMiklos Vajna