Have each dependency update LD_LIBRARY_PATH

Author: Andras Fekete

scripts/utils-openssl.sh

@@ -34,6 +34,12 @@ OPENSSL_INSTALL_DIR=${SCRIPT_DIR}/../openssl-install
 NUMCPU=${NUMCPU:-8}
 WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
 
+if [ -z $LD_LIBRARY_PATH ]; then
+  export LD_LIBRARY_PATH=$OPENSSL_INSTALL_DIR/lib64
+else
+  export LD_LIBRARY_PATH=$OPENSSL_INSTALL_DIR/lib64:$LD_LIBRARY_PATH
+fi
+
 clone_openssl() {
     if [ -d ${OPENSSL_SOURCE_DIR} ]; then
         OPENSSL_TAG_CUR=$(cd ${OPENSSL_SOURCE_DIR} && (git describe --tags 2>/dev/null || git branch --show-current))

scripts/utils-wolfprovider.sh

@@ -38,11 +38,6 @@ install_wolfprov() {
 
     init_openssl
     init_wolfssl
-    if [ -z $LD_LIBRARY_PATH ]; then
-      export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
-    else
-      export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
-    fi
     printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
 
     if [ ! -d ${WOLFPROV_INSTALL_DIR} ]; then

scripts/utils-wolfssl.sh

@@ -32,6 +32,12 @@ WOLFSSL_CONFIG_CFLAGS=${WOLFSSL_CONFIG_CFLAGS:-"-I${OPENSSL_INSTALL_DIR}/include
 
 WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
 
+if [ -z $LD_LIBRARY_PATH ]; then
+  export LD_LIBRARY_PATH="$WOLFSSL_INSTALL_DIR/lib"
+else
+  export LD_LIBRARY_PATH="$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
+fi
+
 # Depends on OPENSSL_INSTALL_DIR
 clone_wolfssl() {
     if [ -d ${WOLFSSL_SOURCE_DIR} ]; then