diff options
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/localize | 8 | ||||
| -rwxr-xr-x | solenv/bin/localize_sl | 13 |
2 files changed, 5 insertions, 16 deletions
diff --git a/solenv/bin/localize b/solenv/bin/localize index 9504e8ee37ed..ec51af9fddfd 100755 --- a/solenv/bin/localize +++ b/solenv/bin/localize @@ -4,12 +4,14 @@ if [ x${SOLARENV}x = xx ]; then exit 1 fi -# localize.pl calls localize_sl in solver bin directory which depends on dynamic -# libraries in solver lib directory but has no correct RPATH (or equivalent): if [ "${OS?}" = MACOSX ]; then export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib else export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib fi -exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@" +pushd $(pwd) +cd ${SRC_ROOT} +exec $SOLARVERSION/$INPATH/bin/localize_sl "$@" +popd + diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl deleted file mode 100755 index d0db56084a19..000000000000 --- a/solenv/bin/localize_sl +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -if [ x${SOLARENV}x = xx ]; then - echo No environment found, please use 'setsolar' -exit 1 -fi - -if [ "${OS?}" = MACOSX ]; then - export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib -else - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib -fi - -exec $SOLARVERSION/$INPATH/bin/localize_sl "$@" |