Skip to content

Commit

Permalink
Move parallel build check higher in GCC dockerfile so the output is e…
Browse files Browse the repository at this point in the history
…asier to find in the logs
  • Loading branch information
joeyparrish committed Mar 11, 2024
1 parent 83adc06 commit 85600e5
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions deps/gcc.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ ENV INSTALLDIR="$BASEDIR/install"
ENV STAGINGDIR="$BASEDIR/staging"
ENV PARALLEL_BUILD="$PARALLEL_BUILD"

# Choose parallel build or not. Parallel builds are hanging under qemu on
# GitHub, so we serialize building there. If parallel builds are disabled,
# replace nproc so it always says "1".
RUN echo "nproc = $(nproc)"
RUN echo "PARALLEL_BUILD = $PARALLEL_BUILD"
RUN if [[ "$PARALLEL_BUILD" == 0 ]]; then echo -e "#!/bin/sh\necho 1" > $(which nproc); fi

RUN mkdir -p "$SRCDIR"
RUN mkdir -p "$BUILDDIR"
RUN mkdir -p "$INSTALLDIR"
Expand All @@ -44,13 +51,6 @@ RUN wget ftp://sourceware.org/pub/newlib/${NEWLIB}.tar.gz -O - | tar -xz

RUN apk add --no-cache bash build-base zlib-dev

# Choose parallel build or not. Parallel builds are hanging under qemu on
# GitHub, so we serialize building there. If parallel builds are disabled,
# replace nproc so it always says "1".
RUN echo "nproc = $(nproc)"
RUN echo "PARALLEL_BUILD = $PARALLEL_BUILD"
RUN if [[ "$PARALLEL_BUILD" == 0 ]]; then echo -e "#!/bin/sh\necho 1" > $(which nproc); fi

#################################################################################
########################## Building binutils ##############################
#################################################################################
Expand Down

0 comments on commit 85600e5

Please sign in to comment.