From 6e9b02bfa169a283d5ef9c18b0bdd444d0807123 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 30 Nov 2001 12:53:56 +0000 Subject: [PATCH] #95466# introduced FILLUPARC --- solenv/inc/settings.mk | 10 ++++++++-- solenv/inc/unxlngi4.mk | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 5845b9bb5319..4ae84471cb1a 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -2,9 +2,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.87 $ +# $Revision: 1.88 $ # -# last change: $Author: hjs $ $Date: 2001-11-26 18:23:34 $ +# last change: $Author: hjs $ $Date: 2001-11-30 13:53:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -1347,6 +1347,12 @@ STDLIB+=$(LIBSTLPORT) STDSHL+=$(LIBSTLPORT) .ENDIF # "$(NO_DEFAULT_STL)"=="" +# fill up unresolved symbols not found else where +.IF "$(FILLUPARC)"!="" +STDLIB+=$(FILLUPARC) +STDSHL+=$(FILLUPARC) +.ENDIF # "$(FILUPARC)"!="" + .IF "$(DISABLE_JAVA)"=="" .IF "$(SOLAR_JAVA)"!="" CDEFS+=$(JAVADEF) diff --git a/solenv/inc/unxlngi4.mk b/solenv/inc/unxlngi4.mk index 71b6427cbe2e..4706292441a2 100644 --- a/solenv/inc/unxlngi4.mk +++ b/solenv/inc/unxlngi4.mk @@ -2,9 +2,9 @@ # # $RCSfile: unxlngi4.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: hjs $ $Date: 2001-11-21 13:59:56 $ +# last change: $Author: hjs $ $Date: 2001-11-30 13:53:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -194,9 +194,10 @@ STDLIBGUIST=-lX11 -ldl -lm STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm STDSHLCUIMT=-ldl -lpthread -lm -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ +LIBSTLPORT=$(DYNAMIC) -lstlport_gcc LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) +FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) # name of library manager LIBMGR=ar