diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-02-22 09:25:20 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-02-22 09:25:44 +0100 |
| commit | 33eefb2c5e15b6eb69629632cf5dc7c2f3452df8 (patch) | |
| tree | b376ccf8a3bc6ed3c08ac99d2d16a1090ecae7f4 | |
| parent | 22e96521da9614c07b75452dc27014aca079fbf1 (diff) | |
Bundle again C++ stdlibs with generic Linux build
| -rw-r--r-- | distro-configs/LibreOfficeLinux.conf | 1 | ||||
| -rw-r--r-- | distro-configs/OxygenOfficeLinux.conf | 1 | ||||
| -rw-r--r-- | external/gcc3_specific/makefile.mk | 2 |
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" |