diff --git a/lldb/source/Plugins/Platform/Android/AdbClient.cpp b/lldb/source/Plugins/Platform/Android/AdbClient.cpp
index ffccd6d628aade32c5a8e394e4f816c40ed2bffa..50a4a07a9bab429fe4dcb6c6059d279aced2894a 100644
--- a/lldb/source/Plugins/Platform/Android/AdbClient.cpp
+++ b/lldb/source/Plugins/Platform/Android/AdbClient.cpp
@@ -134,7 +134,7 @@ Status AdbClient::Connect() {
   Status error;
   m_conn = std::make_unique<ConnectionFileDescriptor>();
   std::string port = "5037";
-  if (const char *env_port = std::getenv("ANDROID_ADB_SERVER_PORT")) {
+  if (const char *env_port = std::getenv("HDC_SERVER_PORT")) {
     port = env_port;
   }
   std::string uri = "connect://127.0.0.1:" + port;
diff --git a/lldb/source/Plugins/Platform/OHOS/PlatformOHOS.cpp b/lldb/source/Plugins/Platform/OHOS/PlatformOHOS.cpp
index 249cd5e9d801a55fbf5fafa4b2201b49f3be5eac..d28a73e3ec0dd756630a28007bbe9f9bd054b5bf 100644
--- a/lldb/source/Plugins/Platform/OHOS/PlatformOHOS.cpp
+++ b/lldb/source/Plugins/Platform/OHOS/PlatformOHOS.cpp
@@ -221,6 +221,9 @@ Status PlatformOHOS::DisconnectRemote() {
   if (error.Success()) {
     m_device_id.clear();
     m_sdk_version = 0;
+    if (m_remote_platform_sp) {
+      m_remote_platform_sp = nullptr;
+    }
   }
   return error;
 }
diff --git a/llvm-build/build.py b/llvm-build/build.py
index a200c11b05c49c4d812b26ca45e75c4eddc78405..0ce6a64935ac249c0c2dd9aaf46056e691a3c048 100755
--- a/llvm-build/build.py
+++ b/llvm-build/build.py
@@ -509,6 +509,10 @@ class LlvmCore(BuildUtils):
 
         self.llvm_compile_llvm_defines(llvm_defines, llvm_cc, llvm_cxx, cflags, ldflags)
 
+        linker_path = os.path.abspath(os.path.join(self.build_config.REPOROOT_DIR, 'prebuilts', 'clang',
+            'ohos', 'linux-x86_64', 'llvm', 'bin', 'ld.lld'))
+        llvm_defines['CMAKE_LINKER'] = linker_path
+
         self.build_llvm(targets=self.build_config.TARGETS,
                         build_dir=llvm_path,
                         install_dir=out_dir,
diff --git a/llvm-build/env_prepare.sh b/llvm-build/env_prepare.sh
index 527c69a51fd988e0e3261614b8b6c65a1d6c8f8d..acfc3d247f5d3fc1dc9dafc8a121f6684b5a7f98 100755
--- a/llvm-build/env_prepare.sh
+++ b/llvm-build/env_prepare.sh
@@ -36,7 +36,7 @@ function download_and_archive() {
     archive_dir=$1
     download_source_url=$2
     bin_file=$(basename ${download_source_url})
-    #wget -t3 -T10 -O "${bin_dir}/${bin_file}" "${download_source_url}"
+    wget -t3 -T10 -O "${bin_dir}/${bin_file}" "${download_source_url}"
     if [ ! -d "${code_dir}/${archive_dir}" ];then
         mkdir -p "${code_dir}/${archive_dir}"
     fi
@@ -51,20 +51,20 @@ function download_and_archive() {
 
 
 copy_config="""
-prebuilts/clang/ohos/${host_platform}-${host_cpu},https://mirrors.huaweicloud.com/openharmony/compiler/clang/12.0.1-530132/${host_platform}/clang-530132-${host_platform}-x86_64.tar.bz2
 """
 
 copy_config_linux_x86_64="""
 prebuilts/cmake,https://mirrors.huaweicloud.com/harmonyos/compiler/cmake/3.16.5/${host_platform}/cmake-${host_platform}-x86-3.16.5.tar.gz
+prebuilts/clang/ohos/${host_platform}-${host_cpu},https://mirrors.huaweicloud.com/openharmony/compiler/clang/10.0.1-62608/${host_platform}/llvm.tar.gz
 prebuilts/clang/ohos/${host_platform}-${host_cpu},https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/clang+llvm-10.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
 """
 
 copy_config_darwin_x86_64="""
 prebuilts/cmake,https://mirrors.huaweicloud.com/harmonyos/compiler/cmake/3.16.5/${host_platform}/cmake-${host_platform}-x86-3.16.5.tar.gz
-prebuilts/clang/ohos/${host_platform}-${host_cpu},https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/clang+llvm-10.0.1-x86_64-apple-darwin.tar.xz
+prebuilts/clang/ohos/${host_platform}-${host_cpu},https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/clang+llvm-12.0.0-x86_64-apple-darwin.tar.xz
 """
 
-# 
+
 if [[ "${host_platform}" == "linux" ]]; then
     if [[ "${host_cpu}" == "x86_64" ]]; then
         copy_config+=${copy_config_linux_x86_64}
@@ -86,7 +86,6 @@ else
 fi
 
 
-
 for i in $(echo ${copy_config})
 do
     unzip_dir=$(echo $i|awk -F ',' '{print $1}')
@@ -95,30 +94,19 @@ do
 done
 
 
-if [ -d "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang-530132" ];then
+if [ -d "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang-62608" ];then
     rm -rf "${code_dir}/prebuilts/clang/ohos/linux-x86_64/llvm"
-    mv "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang-530132" "${code_dir}/prebuilts/clang/ohos/linux-x86_64/llvm"
-    ln -snf 12.0.1 "${code_dir}/prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/current"
+    mv "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang-62608" "${code_dir}/prebuilts/clang/ohos/linux-x86_64/llvm"
+    ln -snf 10.0.1 "${code_dir}/prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/current"
 fi
 
-if [ -d "${code_dir}/prebuilts/clang/ohos/darwin-${host_cpu}/clang-530132" ];then
-    if [[ "${host_cpu}" == "arm64" ]]; then
-        rm -rf "${code_dir}/prebuilts/clang/ohos/darwin-arm64/llvm"
-        mv "${code_dir}/prebuilts/clang/ohos/darwin-arm64/clang-530132" "${code_dir}/prebuilts/clang/ohos/darwin-arm64/llvm"
-        ln -snf 12.0.1 "${code_dir}/prebuilts/clang/ohos/darwin-arm64/llvm/lib/clang/current"
-    else
-        rm -rf "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/llvm"
-        mv "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/clang-530132" "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/llvm"
-        ln -snf 12.0.1 "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/llvm/lib/clang/current"
-    fi
-fi
 
-if [ -d "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang+llvm-10.0.1-x86_64-gnu-ubuntu-16.04.tar.xz" ];then
+if [ -d "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang+llvm-10.0.1-x86_64-linux-gnu-ubuntu-16.04" ];then
     rm -rf "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang-10.0.1"
-    mv "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang+llvm-10.0.1-x86_64-gnu-ubuntu-16.04" "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang-10.0.1"
+    mv "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang+llvm-10.0.1-x86_64-linux-gnu-ubuntu-16.04" "${code_dir}/prebuilts/clang/ohos/linux-x86_64/clang-10.0.1"
 fi
 
-if [ -d "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/clang+llvm-10.0.1-x86_64-apple-darwin" ];then
+if [ -d "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/clang+llvm-12.0.0-x86_64-apple-darwin" ];then
     rm -rf "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/clang-10.0.1"
-    mv "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/clang+llvm-10.0.1-x86_64-apple-darwin" "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/clang-10.0.1"
+    mv "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/clang+llvm-12.0.0-x86_64-apple-darwin" "${code_dir}/prebuilts/clang/ohos/darwin-x86_64/clang-10.0.1"
 fi