diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 06:49:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 06:49:16 +0000 |
| commit | b3b9f5cebe631f523cafcff6abb385db6fb866dc (patch) | |
| tree | 7e0898c836553e93f5149e749554246d85e988a5 /solenv | |
| parent | cb110c92ff9e09badc509ff9e806afbdc22ca37f (diff) | |
INTEGRATION: CWS swwarnings (1.32.22); FILE MERGED
2007/08/22 14:26:10 tl 1.32.22.6: #i69287# warning-free code
2007/08/21 10:44:43 tl 1.32.22.5: RESYNC: (1.36-1.39); FILE MERGED
2007/06/29 05:36:04 os 1.32.22.4: merge error fixed
2007/06/28 12:26:08 os 1.32.22.3: RESYNC: (1.34-1.36); FILE MERGED
2007/05/29 08:08:16 os 1.32.22.2: RESYNC: (1.32-1.34); FILE MERGED
2007/04/18 07:56:13 tl 1.32.22.1: #i69287# warning-free code
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/unxlngi6.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/solenv/inc/unxlngi6.mk b/solenv/inc/unxlngi6.mk index 453bd71d3d84..5e74f545b442 100644 --- a/solenv/inc/unxlngi6.mk +++ b/solenv/inc/unxlngi6.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxlngi6.mk,v $ # -# $Revision: 1.39 $ +# $Revision: 1.40 $ # -# last change: $Author: hr $ $Date: 2007-07-31 13:06:20 $ +# last change: $Author: hr $ $Date: 2007-09-27 07:49:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -140,8 +140,7 @@ CFLAGSWERRCC=-Werror # settings.mk): MODULES_WITH_WARNINGS := \ extensions \ - soldep \ - sw + soldep # switches for dynamic and static linking STATIC = -Wl,-Bstatic @@ -154,7 +153,7 @@ LINKC*=$(CC) # default linker flags LINKFLAGSDEFS*=-Wl,-z,defs LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' -# flag -Wl,-z,noexecstack sets the NX bit on the stack +# flag -Wl,-z,noexecstack sets the NX bit on the stack LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) # linker flags for linking applications |