[Libreoffice-commits] .: distro-configs/LibreOfficeLinux.conf distro-configs/OxygenOfficeLinux.conf external/gcc3_specific

[Fridrich Strba]

 distro-configs/LibreOfficeLinux.conf  |    1 +
 distro-configs/OxygenOfficeLinux.conf |    1 +
 external/gcc3_specific/makefile.mk    |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 33eefb2c5e15b6eb69629632cf5dc7c2f3452df8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Feb 22 09:25:20 2012 +0100

    Bundle again C++ stdlibs with generic Linux build

diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 8f0b415..4b77cba 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -2,6 +2,7 @@
 --with-system-dicts
 --without-unix-wrapper
 --without-system-zlib
+--without-system-stdlibs
 --without-system-poppler
 --without-system-openssl
 --without-system-mozilla
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index b937f05..d3d5496 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -50,6 +50,7 @@
 --with-jdk-home=/usr/local/jdk1.6.0_23/
 --without-system-dicts
 --without-system-zlib
+--without-system-stdlibs
 --without-system-poppler
 --without-system-openssl
 --without-system-mozilla
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index b6211c4..501acfa 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -6,7 +6,7 @@ TARGET=gcc3_specific
 .INCLUDE: settings.mk
 # ------------------------------------------------------------------
 
-.IF "$(COMID)"=="gcc3"
+.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
 
 .IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"