diff --git a/giteapc.make b/giteapc.make index 8cbb896..df2fd19 100644 --- a/giteapc.make +++ b/giteapc.make @@ -2,24 +2,24 @@ PREFIX ?= $(GITEAPC_PREFIX) VERSION_BINUTILS := 2.37 -VERSION_GCC := 11.2 +VERSION_GCC := 11.2.0 -include giteapc-config.make configure: - @ ./scripts/binutils/configure --version=$(VERSION_BINUTILS) - @ ./scripts/gcc/configure.sh --version=$(VERSION_GCC) + @ cd ./scripts/binutils && ./configure.sh --version=$(VERSION_BINUTILS) + @ cd ./scripts/gcc && ./configure.sh --version=$(VERSION_GCC) build: - @ ./scripts/binutils/build.sh - @ ./scripts/gcc/build.sh + @ cd ./scripts/binutils && ./build.sh + @ cd ./scripts/gcc && ./build.sh install: - @ ./scripts/binutils/install.sh --prefix="$(PREFIX)" - @ ./scripts/gcc/install.sh --prefix="$(PREFIX)" + @ cd ./scripts/binutils && ./install.sh --prefix="$(PREFIX)" + @ cd ./scripts/gcc && ./install.sh --prefix="$(PREFIX)" uninstall: - @ ./scripts/binutils/uninstall.sh --prefix="$(PREFIX)" - @ ./scripts/gcc/uninstall.sh --prefix="$(PREFIX)" + @ cd ./scripts/binutils && ./uninstall.sh --prefix="$(PREFIX)" + @ cd ./scripts/gcc && ./uninstall.sh --prefix="$(PREFIX)" .PHONY: configure build install uninstall diff --git a/scripts/binutils/configure.sh b/scripts/binutils/configure.sh index 3597d7b..b9ff514 100755 --- a/scripts/binutils/configure.sh +++ b/scripts/binutils/configure.sh @@ -50,6 +50,8 @@ esac; done # check version +echo "$(pwd)" + list_version=$(basename $(ls -d ../../patchs/binutils/*)) if [[ "$version" == '?' ]]; then echo "$list_version" diff --git a/scripts/gcc/build.sh b/scripts/gcc/build.sh index cc41378..45d5a17 100755 --- a/scripts/gcc/build.sh +++ b/scripts/gcc/build.sh @@ -66,6 +66,9 @@ fi mkdir -p ../../build/gcc/build cd ../../build/gcc/build +# Install dependencies +../gcc/contrib/download_prerequisites + # diff --git a/scripts/gcc/configure.sh b/scripts/gcc/configure.sh index 089b10f..6bccca2 100755 --- a/scripts/gcc/configure.sh +++ b/scripts/gcc/configure.sh @@ -133,9 +133,6 @@ ln -sf $(pwd)/../binutils/bin/sh-elf-vhex-ranlib sh-elf-vhex/bin/ranlib # Patch OpenLibM building error (which search for sh-elf-vhex-ar) ln -sf $(pwd)/../binutils/bin/sh-elf-vhex-ar sh-elf-vhex/bin/sh-elf-vhex-ar -# Install dependencies -./gcc/contrib/download_prerequisites - # Cache management if [[ "$cache" == 'false' ]]; then