@@ -51,7 +51,8 @@ RUN mkdir -p /home/rust/libs /home/rust/src
51
51
ENV PATH=/root/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
52
52
ENV TARGET_CC=$TARGET-gcc
53
53
ENV TARGET_CXX=$TARGET-g++
54
- ENV TARGET_C_INCLUDE_PATH=/usr/local/musl/$TARGET/include/
54
+ ENV TARGET_HOME=/usr/local/musl/$TARGET
55
+ ENV TARGET_C_INCLUDE_PATH=$TARGET_HOME/include/
55
56
56
57
# Install our Rust toolchain and the `musl` target. We patch the
57
58
# command-line we pass to the installer so that it won't attempt to
@@ -81,25 +82,29 @@ RUN export CC=$TARGET_CC && \
81
82
echo "$CHECKSUM zlib-$VERS.tar.gz" > checksums.txt && \
82
83
sha256sum -c checksums.txt && \
83
84
tar xzf zlib-$VERS.tar.gz && cd zlib-$VERS && \
84
- ./configure --static --archs="-fPIC" --prefix=/usr/local/musl/$TARGET && \
85
+ ./configure --static --archs="-fPIC" --prefix=$TARGET_HOME && \
85
86
make && sudo make install -j 4 && \
86
- cd .. && rm -rf zlib-$VERS.tar.gz zlib-$VERS checksums.txt && \
87
+ cd .. && rm -rf zlib-$VERS.tar.gz zlib-$VERS checksums.txt
88
+
89
+ RUN export CC=$TARGET_CC && \
90
+ export C_INCLUDE_PATH=$TARGET_C_INCLUDE_PATH && \
91
+ export LD=$TARGET-ld && \
87
92
echo "Building OpenSSL" && \
88
93
VERS=1.0.2u && \
89
94
CHECKSUM=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 && \
90
95
curl -sqO https://www.openssl.org/source/openssl-$VERS.tar.gz && \
91
96
echo "$CHECKSUM openssl-$VERS.tar.gz" > checksums.txt && \
92
97
sha256sum -c checksums.txt && \
93
98
tar xzf openssl-$VERS.tar.gz && cd openssl-$VERS && \
94
- ./Configure $OPENSSL_ARCH -fPIC --prefix=/usr/local/musl/$TARGET && \
99
+ ./Configure $OPENSSL_ARCH -fPIC --prefix=$TARGET_HOME && \
95
100
make depend && \
96
101
make && sudo make install -j 4 && \
97
102
cd .. && rm -rf openssl-$VERS.tar.gz openssl-$VERS checksums.txt
98
103
99
- ENV OPENSSL_DIR=/usr/local/musl/$TARGET / \
100
- OPENSSL_INCLUDE_DIR=/usr/local/musl/$TARGET /include/ \
101
- DEP_OPENSSL_INCLUDE=/usr/local/musl/$TARGET /include/ \
102
- OPENSSL_LIB_DIR=/usr/local/musl/$TARGET /lib/ \
104
+ ENV OPENSSL_DIR=$TARGET_HOME / \
105
+ OPENSSL_INCLUDE_DIR=$TARGET_HOME /include/ \
106
+ DEP_OPENSSL_INCLUDE=$TARGET_HOME /include/ \
107
+ OPENSSL_LIB_DIR=$TARGET_HOME /lib/ \
103
108
OPENSSL_STATIC=1
104
109
105
110
# Remove docs and more stuff not needed in this images to make them smaller
0 commit comments