don't add libstlport to STDLIBS if NO_DEFAULT_STL is set
This commit is contained in:
parent
da4da39208
commit
d49bc33a53
1 changed files with 6 additions and 2 deletions
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: settings.mk,v $
|
||||
#
|
||||
# $Revision: 1.17 $
|
||||
# $Revision: 1.18 $
|
||||
#
|
||||
# last change: $Author: pluby $ $Date: 2000-12-03 16:44:49 $
|
||||
# last change: $Author: hjs $ $Date: 2000-12-04 15:18:21 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -1393,6 +1393,10 @@ STDLIB=$(STDLIBCUIST)
|
|||
|
||||
.ENDIF
|
||||
|
||||
.IF "$(NO_DEFAULT_STL)"==""
|
||||
STDLIB+=$(LIBSTLPORT)
|
||||
.ENDIF # "$(NO_DEFAULT_STL)"==""
|
||||
|
||||
.IF "$(SOLAR_JAVA)"!=""
|
||||
CDEFS+=$(JAVADEF)
|
||||
.ENDIF
|
||||
|
|
Loading…
Reference in a new issue