diff options
Diffstat (limited to 'soltools/util/makefile.pmk')
| -rwxr-xr-x[-rw-r--r--] | soltools/util/makefile.pmk | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index ad80f13bf8b9..a119dd844472 100644..100755 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -34,3 +34,19 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend # find 'adjustvisibility' in own output tree ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility + +# avoid STLPort +NO_DEFAULT_STL=TRUE +SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) + +.IF "$(OS)"=="SOLARIS" +# 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 |