[Libreoffice-commits] .: 2 commits - android/qa solenv/gbuild

[Tor Lillqvist]

 android/qa/sc/Makefile                  |    1 +
 solenv/gbuild/LinkTarget.mk             |    4 ++--
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |    3 ++-
 solenv/gbuild/platform/unxgcc.mk        |    3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 27e1281fbb2cc581189cfa6edd0fbaa11fec3d49
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Mar 21 11:26:02 2012 +0200

    We seem to need libfrmlo, too

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 48f590c..c39adcf 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -66,6 +66,7 @@ copy-stuff:
 		  forlo \
 		  foruilo \
 		  freetype \
+		  frmlo \
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
 		  i18npaperlo \
commit 05d6145307cfdadc316c434a24aa86729974c028
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Mar 21 11:25:01 2012 +0200

    WaE: option "-fno-default-inline" is valid for C++/ObjC++ but not for C

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3d691cc..80c24ba 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -38,8 +38,8 @@
 # CFLAGS from environment override debug/optimization flags
 ifeq ($(gb_DEBUGLEVEL),2)
 CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
-CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
-OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
+CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)
+OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)
 else
 CFLAGS ?= $(gb_COMPILEROPTFLAGS)
 CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 834f5e9..7d947ed 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -101,7 +101,8 @@ else
 GGDB2=-g2
 endif
 
-gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline -fno-default-inline
+gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline
+gb_DEBUG_CXXFLAGS := -fno-default-inline
 
 gb_STDLIBS := \
 	mingwthrd \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 9c2b405..5fb5f57 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -188,7 +188,8 @@ else
 GGDB2=-g2
 endif
 
-gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline -fno-default-inline
+gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline
+gb_DEBUG_CXXFLAGS := -fno-default-inline
 
 gb_COMPILERNOOPTFLAGS := -O0