From 6709f2aa122e3ffabe5083bb426c672f7374dced Mon Sep 17 00:00:00 2001 From: Sebastian Birke Date: Tue, 5 Jan 2021 15:20:02 +0100 Subject: [PATCH] nextpnr: move git clone into earlier build stage --- nextpnr.dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nextpnr.dockerfile b/nextpnr.dockerfile index f28ed9bd..9f2e67ab 100644 --- a/nextpnr.dockerfile +++ b/nextpnr.dockerfile @@ -1,5 +1,6 @@ # Authors: # Anton Blanchard +# Sebastian Birke # Unai Martinez-Corral # # Copyright 2019-2021 Unai Martinez-Corral @@ -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 \ @@ -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 \