Install avr-gcc and binutils in same directory

Author: rleh

.github/workflows/build-avr-gcc.yml

@@ -25,14 +25,14 @@ jobs:
 
       - name: Compiling test files
         run: |
-         /opt/avr-gcc/avr-gcc/bin/avr-g++ --version
-         /opt/avr-gcc/avr-gcc/bin/avr-g++ -mmcu=atmega328p test/main1.cpp
-         /opt/avr-gcc/avr-gcc/bin/avr-g++ -mmcu=atmega328p test/main2.cpp
+         /opt/avr-gcc/bin/avr-g++ --version
+         /opt/avr-gcc/bin/avr-g++ -mmcu=atmega328p test/main1.cpp
+         /opt/avr-gcc/bin/avr-g++ -mmcu=atmega328p test/main2.cpp
 
       #- name: Fake toolchain
       #  run: |
       #   mkdir -p /opt/avr-gcc/bin
-      #   cp $(which true) /opt/avr-gcc/avr-gcc/bin/avr-g++
+      #   cp $(which true) /opt/avr-gcc/bin/avr-g++
 
       - name: Create tarball
         run: |

README.md

@@ -2,30 +2,24 @@
 
 ## Installation
 
-Download the latest `avr-gcc.tar.bz2` from [Releases](https://github.com/modm-ext/docker-avr-gcc/releases)
+Download the latest `modm-avr-gcc.tar.bz2` from [Releases](https://github.com/modm-ext/docker-avr-gcc/releases)
 and unpack it to `/opt`:
 
 ```sh
-tar xf avr-gcc.tar.bz2 --directory /opt
+tar xf modm-avr-gcc.tar.bz2 --directory /opt
 ```
 
-Add the `bin/` directories of avr-gcc and avr-binutils to your `$PATH`,
+Add the `bin/` directory to your `$PATH`,
 e.g. by adding the following line to your `~/.bashrc` file:
 
 ```sh
-export PATH="/opt/avr-gcc/avr-gcc/bin:/opt/avr-gcc/avr-binutils/bin:$PATH"
+export PATH="/opt/avr-gcc/bin:$PATH"
 ```
 
 ## Building locally with Docker
 
 There is a Docker image with all prerequisites for building, created from the `Dockerfile` in this repository.
-Pull and start the image from Dockerhub with:
-
-```sh
-docker run -it modm/avr-gcc-prerequisites
-```
-
-Or build the image from the local `Dockerfile` and start it:
+Build the image from the local `Dockerfile` and start it:
 
 ```sh
 docker build --tag avr-gcc-prerequisites:local .
@@ -35,14 +29,14 @@ docker run -it avr-gcc-prerequisites:local
 Inside the Docker container get this repository
 
 ```sh
-git clone https://github.com/modm-ext/docker-avr-gcc.git
+git clone https://github.com/modm-io/avr-gcc.git
 ```
 
 Run the build.sh script
 
 ```sh
-cd docker-avr-gcc
-time ./build.sh
+cd avr-gcc
+./build.sh
 ```
 
 The toolchain will be in `/opt/avr-gcc`.

build.sh

@@ -29,25 +29,25 @@ patch -g 0 -f -p0 -i ../../avr-size.patch
 mkdir build && cd build
 # configure and make
 ../configure \
-        --prefix=${INSTALL}/avr-binutils/ \
         --target=avr \
+        --prefix=${INSTALL}/ \
         --disable-nls \
         --disable-werror
 make -j${cores}
 make install
 
 # prepend path of newly compiled avr-binutils
-export PATH=${INSTALL}/avr-binutils/bin:$PATH
+export PATH=${INSTALL}/bin:$PATH
 
 cd ${root}
 cd ${SRC}/gcc-${VERSION_GCC}
 mkdir build && cd build
 ../configure \
         --target=avr \
-        --prefix=${INSTALL}/avr-gcc/ \
-        --with-ld=${INSTALL}/avr-binutils/bin/avr-ld \
-        --with-as=${INSTALL}/avr-binutils/bin/avr-as \
-        --libdir=${INSTALL}/avr-gcc/avr/lib \
+        --prefix=${INSTALL}/ \
+        --with-ld=${INSTALL}/bin/avr-ld \
+        --with-as=${INSTALL}/bin/avr-as \
+        --libdir=${INSTALL}/avr/lib \
         --enable-languages=c,c++ \
         --disable-nls \
         --disable-libssp \
@@ -62,15 +62,15 @@ make -j${cores}
 make install
 
 # prepend path of newly compiled avr-gcc
-export PATH=${INSTALL}/avr-gcc/bin:$PATH
+#export PATH=${INSTALL}/bin:$PATH
 
 cd ${root}
 cd ${SRC}/avr-libc-${VERSION_LIBC}
 patch -g 0 -f -p0 -i ../../avr-libc-add-mcu-atmega168pb.patch
 build=`./config.guess`
 ./configure \
         --build=${build} \
-        --prefix=${INSTALL}/avr-gcc \
+        --prefix=${INSTALL} \
         --host=avr
 make install -j${cores}