diff options
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 6 | ||||
| -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 |
7 files changed, 11 insertions, 2 deletions
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index b7530e4f5e98..4f237414675b 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -42,7 +42,9 @@ sub action($$$) 'shl/URELIB/URELIB' => '@loader_path', 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib', 'shl/OOO/OOO' => '@loader_path', - 'shl/OXT/URELIB' => '@executable_path/urelibs'); + 'shl/OXT/URELIB' => '@executable_path/urelibs', + 'shl/BOXT/URELIB' => '@executable_path/urelibs', + 'shl/BOXT/OOO' => '@loader_path/../../../../../../basis-link/program'); my ($type, $loc1, $loc2) = @_; my $act = $action{"$type/$loc1/$loc2"}; die "illegal combination $type/$loc/$2" unless defined $act; @@ -50,7 +52,7 @@ sub action($$$) } @ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or die - 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|NONE <filepath>*'; + 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|BOXT|NONE <filepath>*'; $type = shift @ARGV; $loc = shift @ARGV; if ($type eq "extshl") 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 b40814b9a9d7..d47ab8212a9a 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 |