No buildroot and use precompiled gcc

This commit is contained in:
Jordan Carlin 2024-10-13 23:30:37 -07:00
parent 77ed0b4ca5
commit 62743d8237
No known key found for this signature in database
2 changed files with 20 additions and 19 deletions

View File

@ -24,7 +24,7 @@ jobs:
./.github/cli-space-cleanup.sh ./.github/cli-space-cleanup.sh
df -h df -h
- name: install - name: install
run: sudo ./bin/wally-tool-chain-install.sh --clean run: sudo ./bin/wally-tool-chain-install.sh --clean --no-buildroot
- name: Upload installation logs - name: Upload installation logs
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: always() if: always()
@ -85,7 +85,7 @@ jobs:
nsenter -t 1 -m -u -n -i bash -c "$(cat .github/cli-space-cleanup.sh)" nsenter -t 1 -m -u -n -i bash -c "$(cat .github/cli-space-cleanup.sh)"
df -h df -h
- name: install - name: install
run: sudo ./bin/wally-tool-chain-install.sh --clean run: sudo ./bin/wally-tool-chain-install.sh --clean --no-buildroot
- name: Upload installation logs - name: Upload installation logs
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: always() if: always()
@ -133,7 +133,7 @@ jobs:
- name: install packages with sudo - name: install packages with sudo
run: sudo ./bin/wally-package-install.sh run: sudo ./bin/wally-package-install.sh
- name: install - name: install
run: ./bin/wally-tool-chain-install.sh --clean run: ./bin/wally-tool-chain-install.sh --clean --no-buildroot
- name: Upload installation logs - name: Upload installation logs
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: always() if: always()
@ -180,7 +180,7 @@ jobs:
./.github/cli-space-cleanup.sh ./.github/cli-space-cleanup.sh
df -h df -h
- name: install - name: install
run: sudo ./bin/wally-tool-chain-install.sh --clean ${{ matrix.path }} run: sudo ./bin/wally-tool-chain-install.sh --clean --no-buildroot ${{ matrix.path }}
- name: Upload instalation logs - name: Upload instalation logs
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: always() if: always()

View File

@ -228,21 +228,22 @@ fi
# This book is tested with GCC 13.2.0 # This book is tested with GCC 13.2.0
section_header "Installing/Updating RISC-V GNU Toolchain" section_header "Installing/Updating RISC-V GNU Toolchain"
STATUS="riscv-gnu-toolchain" STATUS="riscv-gnu-toolchain"
cd "$RISCV" curl --location https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2024.09.03/riscv64-elf-ubuntu-22.04-gcc-nightly-2024.09.03-nightly.tar.gz | tar xvz --directory="$RISCV" --strip-components=1
# Temporarily pin riscv-gnu-toolchain to use GCC 13.2.0. GCC 14 does not work with the Q extension. # cd "$RISCV"
if git_check "riscv-gnu-toolchain" "https://github.com/riscv/riscv-gnu-toolchain" "$RISCV/riscv-gnu-toolchain/stamps/build-gcc-newlib-stage2" "b488ddb"; then # # Temporarily pin riscv-gnu-toolchain to use GCC 13.2.0. GCC 14 does not work with the Q extension.
cd riscv-gnu-toolchain # if git_check "riscv-gnu-toolchain" "https://github.com/riscv/riscv-gnu-toolchain" "$RISCV/riscv-gnu-toolchain/stamps/build-gcc-newlib-stage2" "b488ddb"; then
git reset --hard && git clean -f && git checkout b488ddb #&& git pull # cd riscv-gnu-toolchain
./configure --prefix="${RISCV}" --with-multilib-generator="rv32e-ilp32e--;rv32i-ilp32--;rv32im-ilp32--;rv32iac-ilp32--;rv32imac-ilp32--;rv32imafc-ilp32f--;rv32imafdc-ilp32d--;rv64i-lp64--;rv64ic-lp64--;rv64iac-lp64--;rv64imac-lp64--;rv64imafdc-lp64d--;rv64im-lp64--;" # git reset --hard && git clean -f && git checkout b488ddb #&& git pull
make -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ] # ./configure --prefix="${RISCV}" --with-multilib-generator="rv32e-ilp32e--;rv32i-ilp32--;rv32im-ilp32--;rv32iac-ilp32--;rv32imac-ilp32--;rv32imafc-ilp32f--;rv32imafdc-ilp32d--;rv64i-lp64--;rv64ic-lp64--;rv64iac-lp64--;rv64imac-lp64--;rv64imafdc-lp64d--;rv64im-lp64--;"
if [ "$clean" ]; then # make -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
cd "$RISCV" # if [ "$clean" ]; then
rm -rf riscv-gnu-toolchain # cd "$RISCV"
fi # rm -rf riscv-gnu-toolchain
echo -e "${SUCCESS_COLOR}RISC-V GNU Toolchain successfully installed/updated!${ENDC}" # fi
else # echo -e "${SUCCESS_COLOR}RISC-V GNU Toolchain successfully installed/updated!${ENDC}"
echo -e "${SUCCESS_COLOR}RISC-V GNU Toolchain already up to date.${ENDC}" # else
fi # echo -e "${SUCCESS_COLOR}RISC-V GNU Toolchain already up to date.${ENDC}"
# fi
# elf2hex (https://github.com/sifive/elf2hex) # elf2hex (https://github.com/sifive/elf2hex)