summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-02-22 09:25:20 +0100
committerPetr Mladek <pmladek@suse.cz>2012-02-22 15:15:57 +0100
commit4b3703e6c31daf2c7cfe485169232a3ae0c3dac8 (patch)
tree742010bd7a18346021ec2dc490d2bd362d17183d
parent19ea1b173ae9004a438903d1cb4ac197d27bacee (diff)
Bundle again C++ stdlibs with generic Linux build
Signed-off-by: Petr Mladek <pmladek@suse.cz>
-rw-r--r--distro-configs/LibreOfficeLinux.conf1
-rw-r--r--distro-configs/OxygenOfficeLinux.conf1
-rw-r--r--external/gcc3_specific/makefile.mk2
3 files changed, 3 insertions, 1 deletions
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 8f0b415fcfd2..4b77cbae6f96 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 b937f058f1bb..d3d549671625 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 b6211c498a7b..501acfab69d6 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"