Skip to content

Commit 308093a

Browse files
committed
Avoid recursive MODULE_DEPS_SHARED variable.
1 parent 8a348c5 commit 308093a

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

Tools/configure/conf_modules.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ def setup_module_deps(v):
2626
if v.PY_ENABLE_SHARED == "1" and (
2727
android_api_level or v.MACHDEP == "cygwin"
2828
):
29-
v.MODULE_DEPS_SHARED = r"$(MODULE_DEPS_SHARED) $(LDLIBRARY)"
29+
v.MODULE_DEPS_SHARED = f"{v.MODULE_DEPS_SHARED} $(LDLIBRARY)"
3030
v.LIBPYTHON = r"$(BLDLIBRARY)"
3131

3232
if v.ac_sys_system == "iOS":
3333
v.MODULE_DEPS_SHARED = (
34-
r"$(MODULE_DEPS_SHARED) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)"
34+
f"{v.MODULE_DEPS_SHARED} $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)"
3535
)
3636

3737

configure-new

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4910,11 +4910,11 @@ function u_setup_module_deps( android_api_level) {
49104910
V["LIBPYTHON"] = ""
49114911
android_api_level = V["ANDROID_API_LEVEL"]
49124912
if (((V["PY_ENABLE_SHARED"] == "1") && (((android_api_level != "") && (android_api_level != "no")) || (V["MACHDEP"] == "cygwin")))) {
4913-
V["MODULE_DEPS_SHARED"] = "$(MODULE_DEPS_SHARED) $(LDLIBRARY)"
4913+
V["MODULE_DEPS_SHARED"] = V["MODULE_DEPS_SHARED"] " $(LDLIBRARY)"
49144914
V["LIBPYTHON"] = "$(BLDLIBRARY)"
49154915
}
49164916
if ((V["ac_sys_system"] == "iOS")) {
4917-
V["MODULE_DEPS_SHARED"] = "$(MODULE_DEPS_SHARED) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)"
4917+
V["MODULE_DEPS_SHARED"] = V["MODULE_DEPS_SHARED"] " $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)"
49184918
}
49194919
}
49204920

0 commit comments

Comments
 (0)