Revert "localize.pl is not necessary" - breaks on Windows

This reverts commit fbb48a21a8c2f4ba00f96544fafc8eb8e908aa10.

2 files changed, 16 insertions, 5 deletions

diff --git a/solenv/bin/localize b/solenv/bin/localize
index ec51af9fddfd..9504e8ee37ed 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -4,14 +4,12 @@ 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
 
-pushd $(pwd)
-cd ${SRC_ROOT}
-exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
-popd
-
+exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
new file mode 100755
index 000000000000..d0db56084a19
--- /dev/null
+++ b/solenv/bin/localize_sl
@@ -0,0 +1,13 @@
+#!/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 "$@"