[Libreoffice-commits] .: Branch 'libreoffice-3-3' - cppu/util

[Tor Lillqvist]

 cppu/util/target.pmk |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e5a21130c93ee3e22364978a746b22bc409bd4be
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Nov 13 11:19:32 2010 +0200

    Make the workaround for the crash at exit effective in a non-debug build
    
    I hadn't noticed that cppu/util/target.pmk was surrounded by
    .IF "$(debug)" == "".

diff --git a/cppu/util/target.pmk b/cppu/util/target.pmk
index 70be64b..86b4571 100644
--- a/cppu/util/target.pmk
+++ b/cppu/util/target.pmk
@@ -45,9 +45,14 @@ CFLAGS += -O
 
 .ELSE
 
-.IF "$(COM)" == "MSC"
 # msvc++: no inlining
+.IF "$(COM)" == "MSC"
 CFLAGS += -Ob0
+.ENDIF
+
+.ENDIF
+
+.IF "$(COM)" == "MSC"
 .IF "$(cppu_no_leak)" == ""
 .IF "$(bndchk)" == ""
 # msvc++: workaround for strange crash at exit: just don't do the
@@ -56,5 +61,3 @@ CFLAGS += -DCPPU_LEAK_STATIC_DATA
 .ENDIF
 .ENDIF
 .ENDIF
-
-.ENDIF