Skip to content

Commit 0f6153a

Browse files
committed
Fix: avoid None values in ginstall env
1 parent c018753 commit 0f6153a

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

graalpython/lib-graalpython/modules/ginstall.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -552,12 +552,18 @@ def install_from_pypi(package, extra_opts=[], add_cflags="", ignore_errors=True,
552552
# make copy of env
553553
env = env.copy() if env is not None else os.environ.copy()
554554
from distutils.sysconfig import get_config_var
555-
env.setdefault("CC", get_config_var("CC"))
556-
env.setdefault("CXX", get_config_var("CXX"))
557-
env.setdefault("AR", get_config_var("AR"))
558-
env.setdefault("RANLIB", get_config_var("RANLIB"))
559-
env.setdefault("CFLAGS", get_config_var("CFLAGS"))
560-
env.setdefault("LDFLAGS", get_config_var("CCSHARED"))
555+
556+
def set_if_exists(env_var, conf_var):
557+
conf_value = get_config_var(conf_var)
558+
if conf_value:
559+
env.setdefault(env_var, conf_value)
560+
561+
set_if_exists("CC", "CC")
562+
set_if_exists("CXX", "CXX")
563+
set_if_exists("AR", "AR")
564+
set_if_exists("RANLIB", "RANLIB")
565+
set_if_exists("CFLAGS", "CFLAGS")
566+
set_if_exists("LDFLAGS", "CCSHARED")
561567

562568
if url:
563569
_install_from_url(url, package=package, extra_opts=extra_opts, add_cflags=add_cflags,

0 commit comments

Comments
 (0)