From b3358d68beb98e764c2c740d0e9a80f3f2590f19 Mon Sep 17 00:00:00 2001 From: liangxinyan Date: Tue, 29 Apr 2025 18:00:40 +0800 Subject: [PATCH 1/3] add 1.84.0 version build config and script Signed-off-by: liangxinyan --- .gitignore | 1 - config.toml | 15 +++++ rust_build.sh | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 config.toml create mode 100755 rust_build.sh diff --git a/.gitignore b/.gitignore index 485968d9c56..1e81f0de3b2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ Session.vim !/tests/run-make/thumb-none-qemu/example/.cargo ## Configuration -/config.toml /Makefile config.mk config.stamp diff --git a/config.toml b/config.toml new file mode 100644 index 00000000000..833f020f7cd --- /dev/null +++ b/config.toml @@ -0,0 +1,15 @@ +[llvm] +download-ci-llvm = false # 使用预编译LLVM加速 + +[build] +target = ["x86_64-unknown-linux-gnu"] # 目标平台 +extended = true # 构建完整的工具链（包括 rustfmt、clippy 等） +tools = ["cargo", "rustfmt", "clippy", "rust-analyzer", "miri", "llvm-tools", "src", "rustdoc", "analysis", "rust-analyzer-proc-macro-srv", "wasm-component-ld", "cargo-miri"] # 包含的工具 +profiler = true + +[rust] +channel = "dev" +profile-generate = "true" + +[install] +prefix = "/usr/local" diff --git a/rust_build.sh b/rust_build.sh new file mode 100755 index 00000000000..8020ee414a3 --- /dev/null +++ b/rust_build.sh @@ -0,0 +1,150 @@ +#!/bin/bash +set -e + +CURRENT_DIR=$(pwd) + +mkdir -p ~/.cargo && touch ~/.cargo/config.toml && chmod 777 ~/.cargo/config.toml +cat > ~/.cargo/config.toml < /dev/null + # 获取rust_std包 + mkdir -p build/cache/2024-10-16 + pushd build/cache/2024-10-16 > /dev/null + wget https://repo.huaweicloud.com/harmonyos/compiler/rust/1.83.0/rust-std-beta-x86_64-unknown-linux-gnu.tar.xz + wget https://repo.huaweicloud.com/harmonyos/compiler/rust/1.83.0/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz + wget https://repo.huaweicloud.com/harmonyos/compiler/rust/1.83.0/cargo-beta-x86_64-unknown-linux-gnu.tar.xz + wget https://repo.huaweicloud.com/harmonyos/compiler/rust/1.83.0/rustc-beta-x86_64-unknown-linux-gnu.tar.xz + wget https://repo.huaweicloud.com/harmonyos/compiler/rust/1.83.0/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz + popd > /dev/null + # 获取rust_src包 + wget https://repo.huaweicloud.com/harmonyos/compiler/rust/1.84.0/rust_src.tar.gz + mkdir tmp_rust && tar -zxvf rust_src.tar.gz -C tmp_rust/ + + if [[ ! -d src/gcc ]]; then + mkdir -p src/gcc + fi + cp -rf tmp_rust/src/gcc/* src/gcc/ + + if [[ ! -d src/llvm-project ]]; then + mkdir -p src/llvm-project + fi + cp -rf tmp_rust/src/llvm-project/* src/llvm-project/ + + if [[ ! -d src/tools/enzyme ]]; then + mkdir -p src/tools/enzyme + fi + cp -rf tmp_rust/src/tools/enzyme/* src/tools/enzyme/ + + if [[ ! -d src/tools/rustc-perf ]]; then + mkdir -p src/tools/rustc-perf + fi + cp -rf tmp_rust/src/tools/rustc-perf/* src/tools/rustc-perf/ + + if [[ ! -d src/tools/cargo ]]; then + mkdir -p src/tools/cargo + fi + cp -rf tmp_rust/src/tools/cargo/* src/tools/cargo/ + + if [[ ! -d src/doc/rust-by-example ]]; then + mkdir -p src/doc/rust-by-example + fi + cp -rf tmp_rust/src/doc/rust-by-example/* src/doc/rust-by-example/ + + if [[ ! -d src/doc/embedded-book ]]; then + mkdir -p src/doc/embedded-book + fi + cp -rf tmp_rust/src/doc/embedded-book/* src/doc/embedded-book/ + + if [[ ! -d src/doc/reference ]]; then + mkdir -p src/doc/reference + fi + cp -rf tmp_rust/src/doc/reference/* src/doc/reference/ + + if [[ ! -d src/doc/edition-guide ]]; then + mkdir -p src/doc/edition-guide + fi + cp -rf tmp_rust/src/doc/edition-guide/* src/doc/edition-guide/ + + if [[ ! -d src/doc/nomicon ]]; then + mkdir -p src/doc/nomicon + fi + cp -rf tmp_rust/src/doc/nomicon/* src/doc/nomicon/ + + if [[ ! -d src/doc/book ]]; then + mkdir -p src/doc/book + fi + cp -rf tmp_rust/src/doc/book/* src/doc/book/ + + if [[ ! -d library/stdarch ]]; then + mkdir -p library/stdarch + fi + cp -rf tmp_rust/library/stdarch/* library/stdarch/ + + if [[ ! -d library/backtrace ]]; then + mkdir -p library/backtrace + fi + cp -rf tmp_rust/library/backtrace/* library/backtrace/ + + mkdir -p vendor + + echo "stage2 build start ..." + python3 x.py build --stage 2 + echo "stage2 build end" + + # libprofiler_builtins-xx.rlib build + python3 x.py build --stage 2 library/std + ls build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/ + + echo "dist rust-dev build start ..." + python3 x.py dist + echo "dist rust build end" +popd > /dev/null + +EXTRA_PATH=$CURRENT_DIR/tmp_rust/extra +pushd $EXTRA_PATH/rustlib > /dev/null + unzip src.zip +popd > /dev/null + +if [[ ! -d $CURRENT_DIR/build/dist ]]; then + echo "rust build fail" + exit 1 +fi + +echo "start add extra files" +pushd $CURRENT_DIR/build/dist > /dev/null + ls -alh $CURRENT_DIR/build/dist/ + tar -zxvf rust-1.84.0-dev-x86_64-unknown-linux-gnu.tar.gz + package_dir="rust-1.84.0-dev-x86_64-unknown-linux-gnu" + pushd rust-1.84.0-dev-x86_64-unknown-linux-gnu > /dev/null + echo "----------rust build start-------------" + chmod 777 install.sh && mkdir rust-toolchain && ./install.sh --prefix="rust-toolchain" + echo "----------rust build finish------------" + mkdir -p rust-toolchain/lib/rustlib/src + popd > /dev/null + + cp -rf $EXTRA_PATH/libclang* $package_dir/rust-toolchain/lib/ + cp $package_dir/rust-toolchain/lib/libclang.so $package_dir/rust-toolchain/lib/libclang.so.20.0.0git + cp $package_dir/rust-toolchain/lib/libclang.so $package_dir/rust-toolchain/lib/libclang.so.20.0git + cp -rf $EXTRA_PATH/rustlib/src $package_dir/rust-toolchain/lib/rustlib/ + cp -rf $EXTRA_PATH/bin/* $package_dir/rust-toolchain/bin/ + rm -rf $package_dir/rust-toolchain/lib/rustlib/x86_64-unknown-linux-gnu/bin +popd > /dev/null +echo "extra files add finish" + +pushd $CURRENT_DIR/build/dist > /dev/null + rm -rf rust-1.84.0-dev-x86_64-unknown-linux-gnu.tar.gz + tar -zcvf rust-1.84.0-dev-x86_64-unknown-linux-gnu.tar.gz rust-1.84.0-dev-x86_64-unknown-linux-gnu +popd > /dev/null + +pushd $CURRENT_DIR/build/dist/rust-1.84.0-dev-x86_64-unknown-linux-gnu > /dev/null + tar -zcvf rust-toolchain.tar.gz rust-toolchain +popd > /dev/null -- Gitee From 674a62b73c5eaecab12f6cb50d6a7c68ac845760 Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Wed, 30 Apr 2025 01:17:44 +0000 Subject: [PATCH 2/3] update rust_build.sh. Signed-off-by: liangxinyan123 --- rust_build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/rust_build.sh b/rust_build.sh index 8020ee414a3..b15ceb11952 100755 --- a/rust_build.sh +++ b/rust_build.sh @@ -110,9 +110,6 @@ pushd $CURRENT_DIR > /dev/null popd > /dev/null EXTRA_PATH=$CURRENT_DIR/tmp_rust/extra -pushd $EXTRA_PATH/rustlib > /dev/null - unzip src.zip -popd > /dev/null if [[ ! -d $CURRENT_DIR/build/dist ]]; then echo "rust build fail" -- Gitee From 345259c0424195f3d8f4b766446944f6a5851024 Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Wed, 30 Apr 2025 02:10:25 +0000 Subject: [PATCH 3/3] update rust_build.sh. Signed-off-by: liangxinyan123 --- rust_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust_build.sh b/rust_build.sh index b15ceb11952..346d95f8023 100755 --- a/rust_build.sh +++ b/rust_build.sh @@ -132,7 +132,7 @@ pushd $CURRENT_DIR/build/dist > /dev/null cp $package_dir/rust-toolchain/lib/libclang.so $package_dir/rust-toolchain/lib/libclang.so.20.0.0git cp $package_dir/rust-toolchain/lib/libclang.so $package_dir/rust-toolchain/lib/libclang.so.20.0git cp -rf $EXTRA_PATH/rustlib/src $package_dir/rust-toolchain/lib/rustlib/ - cp -rf $EXTRA_PATH/bin/* $package_dir/rust-toolchain/bin/ + cp -rf $EXTRA_PATH/bin/* $package_dir/rust-toolchain/bin/ && chmod 755 $package_dir/rust-toolchain/bin/bindgen rm -rf $package_dir/rust-toolchain/lib/rustlib/x86_64-unknown-linux-gnu/bin popd > /dev/null echo "extra files add finish" -- Gitee