Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap

6 files changed, 8 insertions, 34 deletions

diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk
index 08641adf69e1..f0b5765dc43f 100644
--- a/solenv/inc/unxbsdi2.mk
+++ b/solenv/inc/unxbsdi2.mk
@@ -59,12 +59,8 @@ CC*=gcc
 # flags for C and C++ Compiler
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxbsdi3.mk b/solenv/inc/unxbsdi3.mk
index 872c34745bb0..e05a02b8b512 100644
--- a/solenv/inc/unxbsdi3.mk
+++ b/solenv/inc/unxbsdi3.mk
@@ -48,12 +48,8 @@ CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
 CFLAGSOPT=                                     # no optimizing for non products
 .ENDIF # "$(PRODUCT)"!=""
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxbsdx3.mk b/solenv/inc/unxbsdx3.mk
index 986cd42665eb..254a3f6b868f 100644
--- a/solenv/inc/unxbsdx3.mk
+++ b/solenv/inc/unxbsdx3.mk
@@ -48,12 +48,8 @@ CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
 CFLAGSOPT=                                     # no optimizing for non products
 .ENDIF # "$(PRODUCT)"!=""
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index e22499adb074..f751384c4bb8 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -74,13 +74,8 @@ CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
+# flags to enable build with symbols
+CFLAGSENABLESYMBOLS=-g
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index e5cd92055225..b2e22b9e4920 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -72,13 +72,8 @@ CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
+# flags to enable build with symbols
+CFLAGSENABLESYMBOLS=-g
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 7c7f0a88f4f4..ed048403c2a3 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -42,12 +42,8 @@ CXXCPP*:=g++ -E $(EXTRA_CFLAGS)
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(SYSBASE)"!=""
 
-# flags to enable build with symbols; required by crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk