From ab8edea8d15265586694cdd92c9452935cd1c6b6 Mon Sep 17 00:00:00 2001
From: "Bill(Shuzhou) Liu" <shuzhou.liu@amd.com>
Date: Fri, 17 Sep 2021 15:49:53 -0400
Subject: [PATCH] Make RDC to respect the LD_LIBRARY_PATH pass by the cmake

The RDC override the LD_LIBRARY_PATH to force to use the current grpc
path. The change will also add original LD_LIBRARY_PATH to it.

Change-Id: I48da84c3135c6ede129c3cb9148dbb1896b652c3


[ROCm/rdc commit: bd034263d4c1d87465bf498f6066a95f826018a7]
---
 projects/rdc/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/projects/rdc/CMakeLists.txt b/projects/rdc/CMakeLists.txt
index aa54502af5..e04cf0654b 100755
--- a/projects/rdc/CMakeLists.txt
+++ b/projects/rdc/CMakeLists.txt
@@ -162,7 +162,8 @@ if(BUILD_STANDALONE)
    set(GRPC_PLUGIN "${GRPC_ROOT}/bin/grpc_cpp_plugin")
    set(GRPC_LIB_DIR "${GRPC_ROOT}/lib")
 
-   set(ENV{LD_LIBRARY_PATH} ${GRPC_LIB_DIR}:${GRPC_LIB_DIR}64)
+   set(ENV{LD_LIBRARY_PATH} ${GRPC_LIB_DIR}:${GRPC_LIB_DIR}64:$ENV{LD_LIBRARY_PATH})
+   message("LD_LIBRARY_PATH = $ENV{LD_LIBRARY_PATH}")
    foreach(file ${PROTOB_DEF_SRC_FILES})
        execute_process(COMMAND
                ${PROTOB_CMD} --proto_path=${PROTOB_SRC_DIR}