This is an automated email from the ASF dual-hosted git repository.

zykkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 1a2c4bc1d1b [fix](script) Set DYLD_LIBRARY_PATH for macOS in be 
startup script (#36067)
1a2c4bc1d1b is described below

commit 1a2c4bc1d1bfa240098142eeef66de9962e15a5e
Author: zy-kkk <zhongy...@gmail.com>
AuthorDate: Sat Jun 8 14:51:35 2024 +0800

    [fix](script) Set DYLD_LIBRARY_PATH for macOS in be startup script (#36067)
    
    ### Description
    - Added logic to set `DYLD_LIBRARY_PATH` for macOS in the
    `setup_java_env` function of the startup script.
    - This change ensures that the necessary Java dynamic libraries are
    correctly loaded on macOS.
    
    ### Changes
    - Modified `setup_java_env` function to include `DYLD_LIBRARY_PATH`
    setup for macOS.
---
 bin/start_be.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bin/start_be.sh b/bin/start_be.sh
index 38db43557e2..21e28e30e1c 100755
--- a/bin/start_be.sh
+++ b/bin/start_be.sh
@@ -148,12 +148,21 @@ setup_java_env() {
     )"
     if [[ "${java_version}" -gt 8 ]]; then
         export 
LD_LIBRARY_PATH="${JAVA_HOME}/lib/server:${JAVA_HOME}/lib:${LD_LIBRARY_PATH}"
+        if [[ "$(uname -s)" == 'Darwin' ]]; then
+            export 
DYLD_LIBRARY_PATH="${JAVA_HOME}/lib/server:${JAVA_HOME}/lib:${DYLD_LIBRARY_PATH}"
+        fi
         # JAVA_HOME is jdk
     elif [[ -d "${JAVA_HOME}/jre" ]]; then
         export 
LD_LIBRARY_PATH="${JAVA_HOME}/jre/lib/${jvm_arch}/server:${JAVA_HOME}/jre/lib/${jvm_arch}:${LD_LIBRARY_PATH}"
+        if [[ "$(uname -s)" == 'Darwin' ]]; then
+            export 
DYLD_LIBRARY_PATH="${JAVA_HOME}/jre/lib/${jvm_arch}/server:${JAVA_HOME}/jre/lib/${jvm_arch}:${DYLD_LIBRARY_PATH}"
+        fi
         # JAVA_HOME is jre
     else
         export 
LD_LIBRARY_PATH="${JAVA_HOME}/lib/${jvm_arch}/server:${JAVA_HOME}/lib/${jvm_arch}:${LD_LIBRARY_PATH}"
+        if [[ "$(uname -s)" == 'Darwin' ]]; then
+            export 
DYLD_LIBRARY_PATH="${JAVA_HOME}/lib/${jvm_arch}/server:${JAVA_HOME}/lib/${jvm_arch}:${DYLD_LIBRARY_PATH}"
+        fi
     fi
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to