diff options
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/cpp/cpp.h | 3 | ||||
| -rw-r--r-- | soltools/prj/build.lst | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | soltools/util/makefile.pmk | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h index da609dbe53c1..34e18579c35a 100644 --- a/soltools/cpp/cpp.h +++ b/soltools/cpp/cpp.h @@ -15,11 +15,8 @@ #define NULL 0 #endif -#ifndef __alpha typedef unsigned char uchar; -#endif - enum toktype { END, UNCLASS, NAME, NUMBER, STRING, CCON, NL, WS, DSHARP, diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst index 3c4e50eb0cda..73611addf782 100644 --- a/soltools/prj/build.lst +++ b/soltools/prj/build.lst @@ -1,4 +1,4 @@ -so soltools : SUN:so_prereq NULL +so soltools : solenv SUN:so_prereq NULL so soltools usr1 - all so_usr1 NULL so soltools\inc get - all so_inc NULL so soltools\ldump nmake - all so_ldump so_mkdep NULL diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index 33c04cf547eb..bf51cf851b4c 100644..100755 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -34,6 +34,10 @@ ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility # avoid STLPort NO_DEFAULT_STL=TRUE SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) +.IF "$(STLPORT4)" != "" +SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) +SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) +.ENDIF .IF "$(OS)"=="SOLARIS" # hack due to #i53089# |