diff options
| author | sb <sb@openoffice.org> | 2010-04-12 13:19:57 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-12 13:19:57 +0200 |
| commit | 98c0ff7b54919ea54df7fad8814a5f48c12f2d74 (patch) | |
| tree | 83242d2c9f6a1cd73abe6db54f9a43ef8c2845bc /solenv/inc | |
| parent | 4ded51564e225874d110b3a8a4ecb75c6e02c8bb (diff) | |
| parent | f24d6400199d3f8612c0269e4be593c5270fa049 (diff) | |
sb122: merged in cws/sb121
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/settings.mk | 1 | ||||
| -rw-r--r-- | solenv/inc/unxlng.mk | 1 | ||||
| -rw-r--r-- | solenv/inc/unxmacx.mk | 1 | ||||
| -rw-r--r-- | solenv/inc/unxsoli4.mk | 1 | ||||
| -rw-r--r-- | solenv/inc/unxsols4.mk | 1 | ||||
| -rw-r--r-- | solenv/inc/unxsolu4.mk | 2 |
6 files changed, 7 insertions, 0 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 7e9ca7548c22..9ff13e775faf 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1274,6 +1274,7 @@ LINKFLAGSRUNPATH_OOO*= LINKFLAGSRUNPATH_SDK*= LINKFLAGSRUNPATH_BRAND*= LINKFLAGSRUNPATH_OXT*= +LINKFLAGSRUNPATH_BOXT*= LINKFLAGSRUNPATH_NONE*= # make sure both linker variables are set diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk index b27afb8c1fa4..62a96f9c5f49 100644 --- a/solenv/inc/unxlng.mk +++ b/solenv/inc/unxlng.mk @@ -151,6 +151,7 @@ LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= +LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= # flag -Wl,-z,noexecstack sets the NX bit on the stack LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 571a7222e00d..45d004b2c513 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -206,6 +206,7 @@ LINKFLAGSRUNPATH_OOO=-install_name '@___________________________________________ LINKFLAGSRUNPATH_SDK= LINKFLAGSRUNPATH_BRAND= LINKFLAGSRUNPATH_OXT= +LINKFLAGSRUNPATH_BOXT= LINKFLAGSRUNPATH_NONE= LINKFLAGS=$(LINKFLAGSDEFS) diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index 0f227f9520fc..5ddbe058b299 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -137,6 +137,7 @@ LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\' LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= +LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd LINKCFLAGS=-w -mt -z combreloc -norunpath diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index 0bd85aa0bd4f..92720da3de47 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -143,6 +143,7 @@ LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\' LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= +LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd LINKCFLAGS=-w -mt -z combreloc -norunpath diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk index 494ecb0478b3..45dadc53f533 100644 --- a/solenv/inc/unxsolu4.mk +++ b/solenv/inc/unxsolu4.mk @@ -137,6 +137,8 @@ LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= +LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../../../../basis-link/program'\' +LINKFLAGSRUNPATH_NONE= LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4 LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath |