Remove --with-stlport from LO 4.0

The STLport was only built for the benefit of old extensions on platforms that
once used it themselves (Linux x86, Solaris x86 and SPARC, Windows).  We
deliberately break such old extensions for LO 4.0 by no longer shipping that
backwards-compatiblity cludge.

Keeps STLport listed in readlicense_oo/ because of
o3tl/inc/o3tl/compat_functionality.hxx.

Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?).

(cherry picked from commit 77d3777c8934171a9557a96872d020cf12443fb9, minus the
code that addressed Windows C4005 warnings -- which after all were due to
unrelated changes for PCH rather than this commit)
Conflicts:
	postprocess/prj/build.lst

Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829

7 files changed, 0 insertions, 22 deletions

diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index 6bb3a58d956b..b0354f775718 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -21,7 +21,6 @@ static const Path JAVA_HOME;
 static const Path UPD;
 static const String LIBXML_CFLAGS;
 static const String OS;
-static const String STLPORT_VER;
 static const Bool DEBUG;
 static const Bool PRODUCT;
 
@@ -70,7 +69,6 @@ namespace gb
     static const Path SDKDIR;
 };
 
-// GXX_INCLUDE_PATH (Linux)
 // PTHREAD_CFLAGS (Linux)
 // SYSTEM_ICU (Linux)
 // SYSTEM_JPEG (Linux)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 6f3a99c20458..321d42cf419a 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -40,7 +40,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 # SOLARLIB
 # UPD
 
-# GXX_INCLUDE_PATH (Linux)
 # PTHREAD_CFLAGS (Linux)
 # SYSTEM_ICU (Linux)
 # SYSTEM_JPEG (Linux)
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 123a7967f2f2..b9edab02d354 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -40,10 +40,6 @@ gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700)
 
 gb_RC := $(WINDRES)
 
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
 gb_COMPILERDEFS += \
 	-D_MT \
 	-D_NATIVE_WCHAR_T_DEFINED \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 2fa302360aba..21b34a918e4c 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -57,7 +57,6 @@ gb_CPPU_ENV := gcc3
 gb_COMPILERDEFS := \
 	-D$(COM) \
 	-DCPPU_ENV=$(gb_CPPU_ENV) \
-	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 
 ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE)
 gb_COMPILERDEFS += \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 2768fc50d867..1ae3f3cc73f0 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -59,10 +59,6 @@ gb_OSDEFS := \
 	-DUNX \
 	$(PTHREAD_CFLAGS) \
 
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
 gb_CFLAGS := \
 	$(gb_CFLAGS_COMMON) \
 	-fPIC \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index dbd00a1744c4..53d51ac4335f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -44,10 +44,6 @@ gb_OSDEFS := \
 	-DUNX \
 	$(PTHREAD_CFLAGS) \
 
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
 gb_CFLAGS := \
 	$(gb_CFLAGS_COMMON) \
 	-fPIC \
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 6ab521137d30..dbb513d2e06a 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1030,12 +1030,6 @@ COMID=$(COM)
 .ENDIF "$(USE_JAVAVER)"!=""
 .ENDIF			# "$(SOLAR_JAVA)"=="TRUE"
 
-.IF "$(COM)"=="GCC"
-GXX_INCLUDE_PATH*:=$(COMPATH)/include/c++/$(CCVER)
-.EXPORT : GXX_INCLUDE_PATH
-CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
-.ENDIF
-
 # --- extend new environment ----------------------------------
 CDEFS+= -DSUPD=$(UPD)