diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-15 08:58:38 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-15 08:58:38 +0000 |
| commit | e5889ca563d7f38286fd6fd2d5b44be1aa39404a (patch) | |
| tree | 24bfd6af6602146363300d5ede642121a6d4f9ba /solenv/inc/unxsols4.mk | |
| parent | bb9d63026f0a04464eceeb4c438e4f20ffd431b4 (diff) | |
INTEGRATION: CWS ause019 (1.17.146); FILE MERGED
2005/03/10 11:14:31 hjs 1.17.146.3: #i42716# rename LINKFLAGSC to LINKCFLAGS
2005/02/14 16:39:41 hjs 1.17.146.2: #42716# support two sets of LINKFLAGS for linking with CXX and CC
2005/02/14 11:22:43 hjs 1.17.146.1: #i42716# more flexible handling of linker and C++ runtime
Diffstat (limited to 'solenv/inc/unxsols4.mk')
| -rw-r--r-- | solenv/inc/unxsols4.mk | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index 53cf82d9d1ef..609e990535a9 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -2,9 +2,9 @@ # # $RCSfile: unxsols4.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: pjunck $ $Date: 2004-10-22 09:29:50 $ +# last change: $Author: obo $ $Date: 2005-03-15 09:58:38 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -121,8 +121,9 @@ THREADLIB= .IF "$(PURIFY)"!="" LINK=/usr/local/purify-4.2-solaris2/purify CC .ELSE -LINK=CC +LINK=$(CXX) .ENDIF +LINKC=$(CC) # link against set of baseline libraries .IF "$(SYSBASE)"!="" @@ -136,6 +137,7 @@ LD_OPTIONS+=-L $(SYSBASE)$/usr$/lib # -norunpath prevents the compiler from recording his own libs in the runpath LINKFLAGSRUNPATH*=-R\''$$ORIGIN'\' LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp $(LINKFLAGSRUNPATH) -norunpath -library=no%Cstd +LINKCFLAGS=-w -mt -z combreloc $(LINKFLAGSRUNPATH) -norunpath # -z text force fatal error if non PIC code is linked into shared library. Such code # would be expensive on startup @@ -164,6 +166,8 @@ APPLINKSTATIC=$(STATIC) APPLINKSHARED=$(DIRECT) APP_LINKTYPE= +STDLIBCPP=-lCrun + # reihenfolge der libs NICHT egal! STDOBJGUI= .IF "DBG_UTIL" != "" @@ -174,14 +178,15 @@ STDSLOGUI= STDOBJCUI= STDSLOCUI= +# CPPRUNTIME - define where to place C++ runtime if required STDLIBGUIST=$(DYNAMIC) -lm STDLIBCUIST=$(DYNAMIC) -lm STDLIBGUIMT=$(DYNAMIC) -lpthread -lm STDLIBCUIMT=$(DYNAMIC) -lpthread -lm -STDSHLGUIST=$(DYNAMIC) -lCrun -lm -lc -STDSHLCUIST=$(DYNAMIC) -lCrun -lm -lc -STDSHLGUIMT=$(DYNAMIC) -lpthread -lCrun -lm -lc -STDSHLCUIMT=$(DYNAMIC) -lpthread -lCrun -lm -lc +STDSHLGUIST=$(DYNAMIC) CPPRUNTIME -lm -lc +STDSHLCUIST=$(DYNAMIC) CPPRUNTIME -lm -lc +STDSHLGUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc +STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc STDLIBGUIST+=-lX11 STDLIBGUIMT+=-lX11 |