diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:47:49 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:47:49 +0000 |
| commit | 9841bc63b8d1f0d4169591e71608b6e3f861936f (patch) | |
| tree | 5bfa00fe3602ddf1462faca43086f266c6c67134 /solenv | |
| parent | 1d149cab6cf14ae94201ebc641dd09058fa7a4c8 (diff) | |
INTEGRATION: CWS pj55 (1.17.34); FILE MERGED
2006/07/24 20:56:12 pjanik 1.17.34.3: RESYNC: (1.17-1.18); FILE MERGED
2006/07/20 09:40:26 pjanik 1.17.34.2: #i67408#: Disable truncwarn warning
2006/07/19 11:37:59 pjanik 1.17.34.1: #i67301#: Add inllargeint for Intel paltform as well.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/unxsoli4.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index 50e51195ee9e..f2ca3cad1c50 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxsoli4.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: kz $ $Date: 2006-07-19 15:08:45 $ +# last change: $Author: ihi $ $Date: 2006-08-01 11:47:49 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -87,12 +87,19 @@ CFLAGSOUTOBJ=-o # them in the stable UDK API we cannot change # - inllargeuse: "function is too large and will not be expanded inline" is # merely a hint +# - inllargeint: "function is too large to generate inline, consider writing +# it yourself" is merely a hint # - notemsource: "could not find source for function" appears to be spurious # - reftotemp: warns about calling non-const functions on temporary objects, # something legally done by boost::scoped_array<T>::reset, for example # (this_type(p).swap(*this)) +# - truncwarn: "conversion of 64 bit type value to smaller type causes +# truncation" at least with CC 5.8 is reported only at the end of a +# compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see +# sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be +# disabled globally CFLAGSWARNCC= -CFLAGSWARNCXX=+w2 -erroff=doubunder,inllargeuse,notemsource,reftotemp +CFLAGSWARNCXX=+w2 -erroff=doubunder,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn CFLAGSWALLCC=$(CFLAGSWARNCC) CFLAGSWALLCXX=$(CFLAGSWARNCXX) CFLAGSWERRCC=-errwarn=%all @@ -188,6 +195,7 @@ STDSLOGUI= STDOBJCUI= STDSLOCUI= +# CPPRUNTIME - define where to place C++ runtime if required STDLIBGUIST=$(DYNAMIC) -lm STDLIBCUIST=$(DYNAMIC) -lm STDLIBGUIMT=$(DYNAMIC) -lpthread -lm |