Skip to content

Commit 9fa1c9d

Browse files
committed
tools/Dockerfile: Disable out-of-line helpers only on ARM
... to fix build on x86_64. Signed-off-by: Costin Lupu <[email protected]>
1 parent 1e846ea commit 9fa1c9d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tools/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ RUN mkdir /tmp/openssl_src
2525
RUN curl -L https://github.com/openssl/openssl/archive/${OPENSSL_VERSION}.zip -o /tmp/openssl_src/openssl.zip
2626
RUN unzip -q /tmp/openssl_src/openssl.zip -d /tmp/openssl_src
2727
RUN cd /tmp/openssl_src/openssl-${OPENSSL_VERSION} && \
28-
CC=musl-gcc CFLAGS=-fPIC CFLAGS=-mno-outline-atomics ./Configure --prefix=/musl_openssl --openssldir=/musl_openssl no-shared no-engine no-afalgeng linux-$(uname -m) -DOPENSSL_NO_SECURE_MEMORY no-tests && \
28+
if [ $(uname -m ) = "aarch64" ] ; then CFLAGS_ARCH="-mno-outline-atomics" ; fi && \
29+
CC=musl-gcc CFLAGS="-fPIC $CFLAGS_ARCH" ./Configure --prefix=/musl_openssl --openssldir=/musl_openssl no-shared no-engine no-afalgeng linux-$(uname -m) -DOPENSSL_NO_SECURE_MEMORY no-tests && \
2930
make -j$(nproc) && \
3031
make install_sw
3132

0 commit comments

Comments
 (0)