File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -77,6 +77,9 @@ native_output_path() {
7777build_native () {
7878 require_tool cargo
7979 mkdir -p " ${LIB_DIR} "
80+ if [[ -z " ${CARGO_TARGET_AARCH64_UNKNOWN_LINUX_OHOS_LINKER:- } " && -n " ${OHOS_NDK_HOME:- } " ]]; then
81+ export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_OHOS_LINKER=" ${OHOS_NDK_HOME} /native/llvm/bin/aarch64-unknown-linux-ohos-clang"
82+ fi
8083 cargo build \
8184 --manifest-path " ${NATIVE_DIR} /Cargo.toml" \
8285 --target " ${TARGET} " \
@@ -127,6 +130,7 @@ run_docker() {
127130 -e CC_aarch64_unknown_linux_ohos=/root/sdk/native/llvm/bin/aarch64-unknown-linux-ohos-clang \
128131 -e CXX_aarch64_unknown_linux_ohos=/root/sdk/native/llvm/bin/aarch64-unknown-linux-ohos-clang++ \
129132 -e AR_aarch64_unknown_linux_ohos=/root/sdk/native/llvm/bin/llvm-ar \
133+ -e CARGO_TARGET_AARCH64_UNKNOWN_LINUX_OHOS_LINKER=/root/sdk/native/llvm/bin/aarch64-unknown-linux-ohos-clang \
130134 -e GIT_TERMINAL_PROMPT=0 \
131135 -e OHOS_PROFILE=" ${PROFILE} " \
132136 " ${image} " \
Original file line number Diff line number Diff line change @@ -158,6 +158,7 @@ write_github_env() {
158158 echo " CC_aarch64_unknown_linux_ohos=${SDK_ROOT} /native/llvm/bin/aarch64-unknown-linux-ohos-clang"
159159 echo " CXX_aarch64_unknown_linux_ohos=${SDK_ROOT} /native/llvm/bin/aarch64-unknown-linux-ohos-clang++"
160160 echo " AR_aarch64_unknown_linux_ohos=${SDK_ROOT} /native/llvm/bin/llvm-ar"
161+ echo " CARGO_TARGET_AARCH64_UNKNOWN_LINUX_OHOS_LINKER=${SDK_ROOT} /native/llvm/bin/aarch64-unknown-linux-ohos-clang"
161162 echo " CARGO_HTTP_TIMEOUT=120"
162163 echo " CARGO_NET_GIT_FETCH_WITH_CLI=true"
163164 echo " CARGO_NET_RETRY=5"
You can’t perform that action at this time.
0 commit comments