Skip to content

Commit 3956ef4

Browse files
Auto merge of #143415 - Gelbpunkt:cleanup-dist-ppc64le-toolchain, r=<try>
Get rid of build-powerpc64le-toolchain.sh The dist-powerpc64le-linux-musl runner never actually used the toolchain that the script produced, it instead used the one from crosstool-ng. The dist-powerpc64le-linux-gnu runner did use it, from what I can tell mainly to get a glibc 2.17 version with ppc64le support backported. Since crosstool-ng has the necessary patches, we can just use crosstool-ng to get an appropriate toolchain. While at it, use kernel 3.10 headers since that's the version documented in platform support for this target. try-job: dist-powerpc64le-linux-gnu try-job: dist-powerpc64le-linux-musl <!-- homu-ignore:start --> <!-- If this PR is related to an unstable feature or an otherwise tracked effort, please link to the relevant tracking issue here. If you don't know of a related tracking issue or there are none, feel free to ignore this. This PR will get automatically assigned to a reviewer. In case you would like a specific user to review your work, you can assign it to them by using r? <reviewer name> --> <!-- homu-ignore:end -->
2 parents c96a690 + 12bc409 commit 3956ef4

File tree

4 files changed

+7
-90
lines changed

4 files changed

+7
-90
lines changed

src/ci/docker/host-x86_64/dist-powerpc64le-linux-gnu/Dockerfile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,15 @@ COPY scripts/crosstool-ng-build.sh /scripts/
1515
COPY host-x86_64/dist-powerpc64le-linux-gnu/powerpc64le-unknown-linux-gnu.defconfig /tmp/crosstool.defconfig
1616
RUN /scripts/crosstool-ng-build.sh
1717

18-
WORKDIR /build
19-
20-
RUN apt-get install -y --no-install-recommends rpm2cpio cpio
21-
COPY scripts/shared.sh scripts/build-powerpc64le-toolchain.sh /build/
22-
RUN ./build-powerpc64le-toolchain.sh
23-
2418
COPY scripts/sccache.sh /scripts/
2519
RUN sh /scripts/sccache.sh
2620

21+
ENV PATH=$PATH:/x-tools/powerpc64le-unknown-linux-gnu/bin
22+
2723
ENV \
28-
AR_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-ar \
29-
CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
30-
CXX_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-g++
24+
AR_powerpc64le_unknown_linux_gnu=powerpc64le-unknown-linux-gnu-ar \
25+
CC_powerpc64le_unknown_linux_gnu=powerpc64le-unknown-linux-gnu-gcc \
26+
CXX_powerpc64le_unknown_linux_gnu=powerpc64le-unknown-linux-gnu-g++
3127

3228
ENV HOSTS=powerpc64le-unknown-linux-gnu
3329

src/ci/docker/host-x86_64/dist-powerpc64le-linux-gnu/powerpc64le-unknown-linux-gnu.defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CT_ARCH_64=y
99
# CT_DEMULTILIB is not set
1010
CT_ARCH_ARCH="powerpc64le"
1111
CT_KERNEL_LINUX=y
12-
CT_LINUX_V_4_19=y
12+
CT_LINUX_V_3_10=y
13+
CT_GLIBC_V_2_17=y
1314
CT_CC_LANG_CXX=y
1415
CT_GETTEXT_NEEDED=y

src/ci/docker/host-x86_64/dist-powerpc64le-linux-musl/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ COPY scripts/crosstool-ng-build.sh /scripts/
1515
COPY host-x86_64/dist-powerpc64le-linux-musl/powerpc64le-unknown-linux-musl.defconfig /tmp/crosstool.defconfig
1616
RUN /scripts/crosstool-ng-build.sh
1717

18-
WORKDIR /build
19-
20-
RUN apt-get install -y --no-install-recommends rpm2cpio cpio
21-
COPY scripts/shared.sh scripts/build-powerpc64le-toolchain.sh /build/
22-
RUN ./build-powerpc64le-toolchain.sh
23-
2418
COPY scripts/sccache.sh /scripts/
2519
RUN sh /scripts/sccache.sh
2620

src/ci/docker/scripts/build-powerpc64le-toolchain.sh

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

0 commit comments

Comments
 (0)