Skip to content

Commit 55bdb61

Browse files
lopsided98lopsided98
committed
Deduplicate crosstool-ng.sh
1 parent c2f1097 commit 55bdb61

File tree

6 files changed

+6
-30
lines changed

6 files changed

+6
-30
lines changed

‎src/ci/docker/dist-arm-linux/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM ubuntu:16.04
33
COPY scripts/cross-apt-packages.sh /scripts/
44
RUN sh /scripts/cross-apt-packages.sh
55

6-
COPY dist-arm-linux/crosstool-ng.sh /scripts/
7-
RUN sh /scripts/crosstool-ng.sh
6+
COPY scripts/crosstool-ng-1.24.sh /scripts/
7+
RUN sh /scripts/crosstool-ng-1.24.sh
88

99
COPY scripts/rustbuild-setup.sh /scripts/
1010
RUN sh /scripts/rustbuild-setup.sh

‎src/ci/docker/dist-armhf-linux/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM ubuntu:16.04
33
COPY scripts/cross-apt-packages.sh /scripts/
44
RUN sh /scripts/cross-apt-packages.sh
55

6-
COPY dist-armhf-linux/crosstool-ng.sh /scripts/
7-
RUN sh /scripts/crosstool-ng.sh
6+
COPY scripts/crosstool-ng-1.24.sh /scripts/
7+
RUN sh /scripts/crosstool-ng-1.24.sh
88

99
COPY scripts/rustbuild-setup.sh /scripts/
1010
RUN sh /scripts/rustbuild-setup.sh

‎src/ci/docker/dist-armhf-linux/crosstool-ng.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/ci/docker/dist-armv7-linux/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM ubuntu:16.04
33
COPY scripts/cross-apt-packages.sh /scripts/
44
RUN sh /scripts/cross-apt-packages.sh
55

6-
COPY dist-armv7-linux/crosstool-ng.sh /scripts/
7-
RUN sh /scripts/crosstool-ng.sh
6+
COPY scripts/crosstool-ng-1.24.sh /scripts/
7+
RUN sh /scripts/crosstool-ng-1.24.sh
88

99
COPY scripts/rustbuild-setup.sh /scripts/
1010
RUN sh /scripts/rustbuild-setup.sh

‎src/ci/docker/dist-armv7-linux/crosstool-ng.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/ci/docker/dist-arm-linux/crosstool-ng.sh renamed to ‎src/ci/docker/scripts/crosstool-ng-1.24.sh

File renamed without changes.

0 commit comments

Comments
 (0)