Skip to content

Commit

Permalink
nextpnr: move git clone into earlier build stage
Browse files Browse the repository at this point in the history
  • Loading branch information
se-bi committed Jan 17, 2021
1 parent 0184631 commit 6709f2a
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions nextpnr.dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Authors:
# Anton Blanchard
# Sebastian Birke <[email protected]>
# Unai Martinez-Corral
#
# Copyright 2019-2021 Unai Martinez-Corral <[email protected]>
Expand Down Expand Up @@ -36,16 +37,16 @@ ENV LDFLAGS "-Wl,--copy-dt-needed-entries"
RUN apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
libeigen3-dev \
libomp-dev
libomp-dev \
&& git clone https://github.com/YosysHQ/nextpnr.git /tmp/nextpnr \
&& mkdir /tmp/nextpnr/build/

#---

FROM build AS build-ice40
COPY --from=hdlc/pkg:icestorm /icestorm/usr/local/share/icebox /usr/local/share/icebox

RUN git clone https://github.com/YosysHQ/nextpnr.git /tmp/nextpnr \
&& mkdir /tmp/nextpnr/build/ \
&& cd /tmp/nextpnr/build \
RUN cd /tmp/nextpnr/build \
&& cmake .. \
-DARCH=ice40 \
-DBUILD_GUI=OFF \
Expand All @@ -69,9 +70,7 @@ COPY --from=hdlc/pkg:icestorm /icestorm /
FROM build AS build-ecp5
COPY --from=hdlc/pkg:prjtrellis /prjtrellis /

RUN git clone https://github.com/YosysHQ/nextpnr.git /tmp/nextpnr \
&& mkdir /tmp/nextpnr/build/ \
&& cd /tmp/nextpnr/build \
RUN cd /tmp/nextpnr/build \
&& cmake .. \
-DARCH=ecp5 \
-DBUILD_GUI=OFF \
Expand Down

0 comments on commit 6709f2a

Please sign in to comment.