diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:48:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:48:34 +0000 |
| commit | 41e0d74e92d660b1b2e96f6dbaa00eb3eb84623e (patch) | |
| tree | 50006346a28aefe36934f388b105383d3e2c1365 /solenv/inc/unxsoli4.mk | |
| parent | 96000512682917df87d8c6e011d0827d188500cf (diff) | |
CWS-TOOLING: integrate CWS hr58
2008-12-29 16:47:08 +0100 hr r265821 : #i97331#: changes for compiling with SunStudio12 on Solaris 10 (x86)
2008-12-18 16:16:11 +0100 hr r265701 : #i97331#: revert to revision r265576
2008-12-18 16:00:41 +0100 hr r265699 : #i97331#: fix typo in last change
2008-12-17 18:16:18 +0100 hr r265653 : #i97331#: add comment
2008-12-17 18:11:11 +0100 hr r265652 : #i97331#: make -xc99=all again dependend on SYSBASEROOT being set
2008-12-17 01:54:23 +0100 hr r265576 : #i97331#: changes for compiling with SunStudio12 on Solaris 10 (Sparc)
Diffstat (limited to 'solenv/inc/unxsoli4.mk')
| -rw-r--r-- | solenv/inc/unxsoli4.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index e168c37b18f4..4567453f29d0 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -95,8 +95,14 @@ CFLAGSOUTOBJ=-o # 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 +# - wnoretvalue: warning about the last statement of a function not +# returning a value. Unfortunately triggers on perfectly acceptable +# code, for example if the last statement in is a throw statement +# - anonnotype: Warns if a type is declared in an anonymous union. Temporary +# disabled until issue i97325 is fixed. Note: The compiler is actually +# right about this warning, the C++ standard is explicit about this. CFLAGSWARNCC= -CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn +CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype CFLAGSWALLCC=$(CFLAGSWARNCC) CFLAGSWALLCXX=$(CFLAGSWARNCXX) CFLAGSWERRCC=-errwarn=%all @@ -121,10 +127,10 @@ LINKC=$(CC) # link against set of baseline libraries .IF "$(SYSBASE)"!="" C_RESTRICTIONFLAGS*=-xc99=none -LD_OPTIONS+:=-L$(SYSBASE)$/usr/lib +#LD_OPTIONS+:=-L$(SYSBASE)$/usr$/lib CDEFS+=-DSYSBASE="$(SYSBASE)" CFLAGSCC+=$(C_RESTRICTIONFLAGS) -.EXPORT : LD_OPTIONS +#.EXPORT : LD_OPTIONS .ENDIF # "$(SYSBASE)"!="" # -z combreloc combines multiple relocation sections. Reduces overhead on startup |