From 555f0d957b277a79c7f81e1803fe0cacf0df3816 Mon Sep 17 00:00:00 2001 From: liujia178 Date: Thu, 30 May 2024 16:42:52 +0800 Subject: [PATCH] [LLDB] Copy the extension library files to the build path on the OHOS platform Issue: https://gitee.com/openharmony/third_party_llvm-project/issues/I9TIFN Test: Build for OHOS platform Signed-off-by: liujia178 Change-Id: Ifb99b8925263a7d54b643103710b40a7d581b024 --- llvm-build/build-ohos-arm.py | 6 ------ llvm-build/ohos_toolchain_builder.py | 7 ++++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/llvm-build/build-ohos-arm.py b/llvm-build/build-ohos-arm.py index 27931c07287d..f8a730e51377 100755 --- a/llvm-build/build-ohos-arm.py +++ b/llvm-build/build-ohos-arm.py @@ -29,12 +29,6 @@ class ArmToolchainBuilder(OHOSToolchainBuilder): ] ) - self._ldflags.extend( - [ - "-Wl,-rpath,'$ORIGIN/../lib'", - ] - ) - self._llvm_defines.update( { "CMAKE_CXX_FLAGS": " ".join(self._cflags), diff --git a/llvm-build/ohos_toolchain_builder.py b/llvm-build/ohos_toolchain_builder.py index f8a586f90c9d..b0e5476fc154 100644 --- a/llvm-build/ohos_toolchain_builder.py +++ b/llvm-build/ohos_toolchain_builder.py @@ -64,6 +64,7 @@ class OHOSToolchainBuilder: "-Wl,-z,relro,-z,now", "-pie", "-lunwind", + "-Wl,-rpath,'$ORIGIN/../lib'", ] return ldflags @@ -197,11 +198,11 @@ class OHOSToolchainBuilder: def _build_and_install(self, build_target): if self._build_config.build_ncurses: - self._llvm_libs.build_ncurses("", self._llvm_install, self._llvm_triple) + self._llvm_libs.build_ncurses(self._llvm_path, self._llvm_install, self._llvm_triple) if self._build_config.build_libxml2: - self._llvm_libs.build_libxml2(self._llvm_triple, "", self._llvm_install) + self._llvm_libs.build_libxml2(self._llvm_triple, self._llvm_path, self._llvm_install) if self._build_config.build_libedit: - self._llvm_libs.build_libedit("", self._llvm_install, self._llvm_triple) + self._llvm_libs.build_libedit(self._llvm_path, self._llvm_install, self._llvm_triple) if self._build_config.build_python: self._python_builder.build() -- Gitee