-
Notifications
You must be signed in to change notification settings - Fork 411
Export and use CROSS_TOOLCHAIN_PREFIX
.
#1126
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
This will block #1112, #1118, #1123, and #1125 since it touches so many files, but simplifies a lot of the CMake files, as well as the linker files in #1125. This lets us get rid of a few effectively redundant scripts (like linkers for ARMv5TE, MIPS64, and MIPS64EL musl all of which checked for Rust 1.65 for linker flags), since we can now use bors try |
286ec2c
to
2123935
Compare
tryBuild failed: |
Windows and executable permissions strikes again :/ |
tryBuild succeeded: |
bors try |
tryBuild succeeded: |
@@ -27,15 +28,15 @@ RUN mkdir -p $CROSS_SYSROOT/usr/lib64 | |||
RUN ln -s $CROSS_SYSROOT/usr/lib/libc.so $CROSS_SYSROOT/usr/lib64/libc.so | |||
RUN ln -s $CROSS_SYSROOT/usr/lib/libc.so.1 $CROSS_SYSROOT/usr/lib64/libc.so.1 | |||
|
|||
COPY mips64el-linux-musl-gcc.sh /usr/bin/ | |||
COPY rust-1-65-musl-gcc.sh /usr/bin/"$CROSS_TOOLCHAIN_PREFIX"gcc.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice
@@ -37,5 +37,6 @@ COPY linux-runner native-linux-runner base-runner.sh / | |||
|
|||
ENV CROSS_TARGETARCH=$TARGETARCH | |||
ENV CROSS_TARGETVARIANT=$TARGETVARIANT | |||
ENV CROSS_TOOLCHAIN_PREFIX= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need this to be defined as empty?
@@ -26,5 +26,6 @@ COPY --from=0 /qemu /qemu | |||
|
|||
COPY linux-runner base-runner.sh / | |||
|
|||
ENV CROSS_TOOLCHAIN_PREFIX= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto, do we need this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It ensures consistency in all cases, and makes sure that scripts with set -u
won't fail. It might not be technically needed, but ensures we have the exact same behavior for all image types. The only somewhat difference is for emscripten
images, but that's because we really can't have a viable prefix for them, so we just use em
(so emcc
and em++
work, but this is very different than allowing emgcc
and emg++
to work, which don't exist).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bors r+
Build succeeded: |
No description provided.