diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-06 21:28:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-06 22:36:30 +0200 |
| commit | 243ead838369b030579f501ce1f77689ce822f06 (patch) | |
| tree | 38f1250a9e76b7621aef6aa82746c1119b92e5a4 /solenv/inc/unxsols4.mk | |
| parent | 6d508f856fa04952a2a8cc0528c04c0d7e9cf3cf (diff) | |
Undo basis/brand split: move dynamic libraries from basis to brand.
Diffstat (limited to 'solenv/inc/unxsols4.mk')
| -rw-r--r-- | solenv/inc/unxsols4.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index b609951f6800..c1d7aed76045 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -136,9 +136,9 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS) LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\' LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' +LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../basis-link/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_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_NONE= LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd |