Skip to content

Commit f5bb5f2

Browse files
authored
[BE] Define openssl_flags (#1285)
Rather than have two invocations of `./configure`
1 parent 770704c commit f5bb5f2

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

common/install_cpython.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ function do_cpython_build {
2222

2323
local prefix="/opt/_internal/cpython-${py_ver}"
2424
mkdir -p ${prefix}/lib
25-
26-
# -Wformat added for https://bugs.python.org/issue17547 on Python 2.6
2725
if [[ -z "${WITH_OPENSSL+x}" ]]; then
28-
CFLAGS="-Wformat" ./configure --prefix=${prefix} --disable-shared > /dev/null
26+
local openssl_flags=""
2927
else
30-
CFLAGS="-Wformat" ./configure --prefix=${prefix} --with-openssl=${WITH_OPENSSL} --with-openssl-rpath=auto --disable-shared > /dev/null
28+
local openssl_flags="--with-openssl=${WITH_OPENSSL} --with-openssl-rpath=auto"
3129
fi
3230

31+
# -Wformat added for https://bugs.python.org/issue17547 on Python 2.6
32+
CFLAGS="-Wformat" ./configure --prefix=${prefix} ${openssl_flags} --disable-shared > /dev/null
33+
3334
make -j40 > /dev/null
3435
make install > /dev/null
3536

0 commit comments

Comments
 (0)