From d1db7a8f38fdb2cfb57c8035f0524d9e368ac932 Mon Sep 17 00:00:00 2001
From: Nikita Shulga <nshulga@fb.com>
Date: Thu, 26 Jan 2023 19:59:22 -0800
Subject: [PATCH] [BE] Define `openssl_flags`

Rather than have two invocations of ./configure
---
 common/install_cpython.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/install_cpython.sh b/common/install_cpython.sh
index 309e27cd3..a1716e641 100755
--- a/common/install_cpython.sh
+++ b/common/install_cpython.sh
@@ -22,14 +22,15 @@ function do_cpython_build {
 
     local prefix="/opt/_internal/cpython-${py_ver}"
     mkdir -p ${prefix}/lib
-
-    # -Wformat added for https://bugs.python.org/issue17547 on Python 2.6
     if [[ -z  "${WITH_OPENSSL+x}" ]]; then
-        CFLAGS="-Wformat" ./configure --prefix=${prefix} --disable-shared > /dev/null
+       local openssl_flags=""
     else
-        CFLAGS="-Wformat" ./configure --prefix=${prefix} --with-openssl=${WITH_OPENSSL} --with-openssl-rpath=auto --disable-shared > /dev/null
+        local openssl_flags="--with-openssl=${WITH_OPENSSL} --with-openssl-rpath=auto"
     fi
 
+    # -Wformat added for https://bugs.python.org/issue17547 on Python 2.6
+    CFLAGS="-Wformat" ./configure --prefix=${prefix} ${openssl_flags} --disable-shared > /dev/null
+
     make -j40 > /dev/null
     make install > /dev/null