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/unxgcc.mk | |
parent | 6d508f856fa04952a2a8cc0528c04c0d7e9cf3cf (diff) |
Undo basis/brand split: move dynamic libraries from basis to brand.
Diffstat (limited to 'solenv/inc/unxgcc.mk')
-rw-r--r-- | solenv/inc/unxgcc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index 028e954c127a..45f690177ac7 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -169,9 +169,9 @@ LINKFLAGSDEFS*=-Wl,-z,defs LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags +LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags +LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_NONE= # flag -Wl,-z,noexecstack sets the NX bit on the stack |