fix build using configure (workaround for issue i53089

4 files changed, 14 insertions, 5 deletions

diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index d87eb9a89f07..4c8f03942793 100755
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -53,7 +53,8 @@ DEPOBJFILES	=	$(APP1OBJ)
 APP1STDLIBS =   -lelf
 APP1RPATH   =   NONE
 
-APP1STDLIBS+=-lstlport
+#APP1STDLIBS+=-lstlport
+APP1STDLIBS+=-lCstd
 
 .ENDIF "$(OS)"=="SOLARIS"
 
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
index 95cd3da8d857..691996d56cca 100755
--- a/soltools/mkdepend/collectdircontent.cxx
+++ b/soltools/mkdepend/collectdircontent.cxx
@@ -64,7 +64,7 @@ bool IncludesCollection::exists(string filePath) {
     } else {
         return true;
     };
-    return false;
+    //return false;
 };
 
 extern "C" {
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index 7ee0d7f20a09..af4bae825601 100755
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -76,7 +76,8 @@ CDEFS+=-D_DEBUG
 .ENDIF                        # "$(COM)"=="MSC"
 
 .IF "$(OS)"=="SOLARIS"
-APP1STDLIBS+=-lstlport
+#APP1STDLIBS+=-lstlport
+APP1STDLIBS+=-lCstd
 .ENDIF
 
 
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index 1d0c571ec497..a119dd844472 100755
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -40,6 +40,13 @@ NO_DEFAULT_STL=TRUE
 SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC))
 
 .IF "$(OS)"=="SOLARIS"
-SOLARINC+=-I$(COMPATH)/prod/include/CC/stlport4
-SOLARLIB+=-L$(COMPATH)/prod/lib/stlport4
+# hack due to #i53089#
+.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)"
+HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
+.ELSE			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
+HELP_COMPATH:=$(COMPATH)
+.ENDIF			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
+#SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/stlport4
+#SOLARLIB+=-L$(HELP_COMPATH)/prod/lib/stlport4
+SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
 .ENDIF