diff --git a/rust_build.sh b/rust_build.sh index bc13427fc811aad0064173196b160cd74e2d7d10..682f1ff107a78a2fed22967f413e5f8a02a7d679 100644 --- a/rust_build.sh +++ b/rust_build.sh @@ -116,14 +116,25 @@ pushd $CURRENT_DIR/build/dist > /dev/null package_dir="rust-1.85.0-dev-x86_64-unknown-linux-gnu" pushd rust-1.85.0-dev-x86_64-unknown-linux-gnu > /dev/null echo "----------rust build start-------------" - chmod 777 install.sh && mkdir xxxxx && ./install.sh --prefix="xxxxx" + 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/xxxxx/lib/ - cp -rf $EXTRA_PATH/bin/* $package_dir/xxxxx/bin/ - cp -rf $EXTRA_PATH/rustlib/src $package_dir/xxxxx/lib/rustlib/ - cp -rf $EXTRA_PATH/rustlib/lib/* $package_dir/xxxxx/lib/rustlib/x86_64-unknown-linux-gnu/lib/ - rm -rf $package_dir/xxxxx/lib/rustlib/x86_64-unknown-linux-gnu/bin + + tar -zxvf rust-src-1.85.0-dev.tar.gz + src_dir="rust-src-1.85.0-dev" + pushd $src_dir > /dev/null + echo "----------src build start-------------" + chmod 777 install.sh && ./install.sh + echo "----------src build finish------------" + popd > /dev/null + + cp -rf $src_dir/rust-src/lib/rustlib/src/rust $package_dir/rust-toolchain/lib/rustlib/src/ + + cp -rf $EXTRA_PATH/libclang* $package_dir/rust-toolchain/lib/ + cp -rf $EXTRA_PATH/bin/* $package_dir/rust-toolchain/bin/ + cp -rf $EXTRA_PATH/rustlib/lib/* $package_dir/rust-toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/ + rm -rf $package_dir/rust-toolchain/lib/rustlib/x86_64-unknown-linux-gnu/bin popd > /dev/null echo "extra files add finish"