From b3c3620739ae36fd00d576a23e527c3ae689e521 Mon Sep 17 00:00:00 2001 From: Sitao Wang Date: Tue, 5 Nov 2024 07:52:07 +0800 Subject: [PATCH] build: Reformat files and remove gcc-10 from linux build script --- .devcontainer/devcontainer.json | 2 +- .../scripts/lib_install/linux/install-dev.sh | 41 +++++++------------ 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e5dd858..5d790ba 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,4 +3,4 @@ "dockerfile": "Dockerfile", "context": "..", }, -} \ No newline at end of file +} diff --git a/tools/scripts/lib_install/linux/install-dev.sh b/tools/scripts/lib_install/linux/install-dev.sh index 4b5f020..88fa181 100755 --- a/tools/scripts/lib_install/linux/install-dev.sh +++ b/tools/scripts/lib_install/linux/install-dev.sh @@ -8,29 +8,18 @@ set -u apt-get update DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ - ca-certificates \ - checkinstall \ - cmake \ - curl \ - g++ \ - g++-10 \ - gcc \ - gcc-10 \ - git \ - libcurl4 \ - libcurl4-openssl-dev \ - libssl-dev \ - make \ - pkg-config \ - python3 \ - python3-pip \ - python3-venv - -# Add alternatives for cpp-10, gcc-10, and g++-10 -# NOTE: We use a low priority to avoid affecting the prioritization of any existing alternatives -# on the user's system. -update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-10 0 \ - --slave /usr/share/man/man1/cc.1.gz cc.1.gz /usr/share/man/man1/gcc.1.gz -update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-10 0 \ - --slave /usr/share/man/man1/c++.1.gz c++.1.gz /usr/share/man/man1/g++.1.gz -update-alternatives --install /lib/cpp cpp /usr/bin/cpp-10 0 \ No newline at end of file + ca-certificates \ + checkinstall \ + cmake \ + curl \ + g++ \ + gcc \ + git \ + libcurl4 \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + pkg-config \ + python3 \ + python3-pip \ + python3-venv