From d3d6fb5c257f30c5c2ef764fe66b5748f56c79cf Mon Sep 17 00:00:00 2001 From: dijunkun Date: Thu, 30 Jul 2026 17:55:30 +0800 Subject: [PATCH] docs: use GCC 10 toolchain for Linux builds --- README.md | 10 +++++++--- README_EN.md | 12 +++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ffb5b86..0876987 100644 --- a/README.md +++ b/README.md @@ -127,17 +127,21 @@ git submodule update --init --recursive # 已安装发行版 PipeWire 0.3 开发包时可跳过此步骤。 sudo ./docker/linux-build/install-pipewire-sdk.sh -xmake f -m release --USE_CUDA=false --cc=gcc-10 --cxx=g++-10 -y +xmake f -c -m release --USE_CUDA=false --toolchain=gcc-10 -y xmake b -vy crossdesk ``` +这里应使用 `--toolchain=gcc-10`,以确保 CrossDesk 及 xmake 在配置阶段构建的 +libyuv 等第三方包都使用 GCC 10。只指定 `--cc`/`--cxx` 时,依赖安装可能仍回退到 +系统默认的 `/bin/cc` 和 `/bin/c++`。`-c` 会清除旧配置,切换编译器时必须保留。 + amd64 构建结果位于 `build/linux/x86_64/release/crossdesk`,arm64 构建结果位于 `build/linux/arm64/release/crossdesk`。 启用 Wayland 和 DRM 的配置示例: ```bash -xmake f -m release --USE_WAYLAND=true --USE_DRM=true --USE_CUDA=false \ - --cc=gcc-10 --cxx=g++-10 -y +xmake f -c -m release --USE_WAYLAND=true --USE_DRM=true --USE_CUDA=false \ + --toolchain=gcc-10 -y xmake b -vy crossdesk ``` diff --git a/README_EN.md b/README_EN.md index 11ca598..7f9a048 100644 --- a/README_EN.md +++ b/README_EN.md @@ -136,17 +136,23 @@ git submodule update --init --recursive # PipeWire 0.3 development packages are already installed. sudo ./docker/linux-build/install-pipewire-sdk.sh -xmake f -m release --USE_CUDA=false --cc=gcc-10 --cxx=g++-10 -y +xmake f -c -m release --USE_CUDA=false --toolchain=gcc-10 -y xmake b -vy crossdesk ``` +Use `--toolchain=gcc-10` so that both CrossDesk and third-party packages such +as libyuv, which xmake builds during configuration, use GCC 10. Specifying only +`--cc`/`--cxx` may still let dependency builds fall back to the system +`/bin/cc` and `/bin/c++`. Keep `-c` when switching compilers to clear the old +configuration. + The amd64 binary is written to `build/linux/x86_64/release/crossdesk`; the arm64 binary is written to `build/linux/arm64/release/crossdesk`. Example configuration with Wayland and DRM capture enabled: ```bash -xmake f -m release --USE_WAYLAND=true --USE_DRM=true --USE_CUDA=false \ - --cc=gcc-10 --cxx=g++-10 -y +xmake f -c -m release --USE_WAYLAND=true --USE_DRM=true --USE_CUDA=false \ + --toolchain=gcc-10 -y xmake b -vy crossdesk ```