summaryrefslogtreecommitdiff
path: root/cppu/util
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2010-11-12 14:38:01 +0100
committerJan Holesovsky <kendy@suse.cz>2010-11-12 14:38:01 +0100
commit66a78826b3c1e5c6fb81e296d6beb1bbc724ef90 (patch)
tree8874eefded2b9439adba4ae567e990aa0efe3053 /cppu/util
parentb59349c8e1844ee0a419a4f0f237b94c8e81c7da (diff)
parentbfdd042d2c9621df7e3850a6a7ee71405c4c2edd (diff)
Merge remote branch 'origin/libreoffice-3-3'
Diffstat (limited to 'cppu/util')
-rw-r--r--cppu/util/target.pmk9
1 files changed, 8 insertions, 1 deletions
diff --git a/cppu/util/target.pmk b/cppu/util/target.pmk
index 3befcb154753..70be64b8e3f4 100644
--- a/cppu/util/target.pmk
+++ b/cppu/util/target.pmk
@@ -45,9 +45,16 @@ CFLAGS += -O
.ELSE
-# msvc++: no inlining
.IF "$(COM)" == "MSC"
+# msvc++: no inlining
CFLAGS += -Ob0
+.IF "$(cppu_no_leak)" == ""
+.IF "$(bndchk)" == ""
+# msvc++: workaround for strange crash at exit: just don't do the
+# cleanup of types and whatnot...
+CFLAGS += -DCPPU_LEAK_STATIC_DATA
+.ENDIF
+.ENDIF
.ENDIF
.ENDIF