Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit 137696c

Browse files
committed
Ensure LDFLAGS are passed to Python configure call.
1 parent 0b36ed8 commit 137696c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

python.Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ ENV AR=$TOOLCHAIN/bin/llvm-ar \
4242
RANLIB=$TOOLCHAIN/bin/llvm-ranlib \
4343
STRIP=$TOOLCHAIN/bin/llvm-strip \
4444
READELF=$TOOLCHAIN/bin/llvm-readelf \
45-
CFLAGS="-fPIC -Wall -Os" LDFLAGS="-Wl,-S"
45+
CFLAGS="-fPIC -Wall -Os" \
46+
LDFLAGS="-Wl,-S"
4647

4748
# Set up a directory for logs.
4849
ENV LOGS_DIR=${BUILD_HOME}/logs/${TARGET_ABI_SHORTNAME}
@@ -168,7 +169,7 @@ ENV SYSROOT_LIB=${TOOLCHAIN}/sysroot/usr/lib/${TOOLCHAIN_TRIPLE}/${ANDROID_API_L
168169
ARG PYTHON_EXTRA_CONFIGURE_FLAGS
169170
ENV PYTHON_EXTRA_CONFIGURE_FLAGS $PYTHON_EXTRA_CONFIGURE_FLAGS
170171
# Call ./configure with enough parameters to work.
171-
RUN cd python-src && LDFLAGS="$(pkg-config --libs-only-L libffi) $(pkg-config --libs-only-L liblzma) -L${LIBBZ2_INSTALL_DIR}/lib -L$OPENSSL_INSTALL_DIR/lib" \
172+
RUN cd python-src && LDFLAGS="${LDFLAGS} $(pkg-config --libs-only-L libffi) $(pkg-config --libs-only-L liblzma) -L${LIBBZ2_INSTALL_DIR}/lib -L$OPENSSL_INSTALL_DIR/lib" \
172173
CFLAGS="${CFLAGS} -I${LIBBZ2_INSTALL_DIR}/include $(pkg-config --cflags-only-I libffi) $(pkg-config --cflags-only-I liblzma)" \
173174
./configure \
174175
--host "$TOOLCHAIN_TRIPLE" \

0 commit comments

Comments
 (0)