From ad24d62882df33551205a049483714636c2d7982 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Sun, 14 Sep 2014 19:19:49 -0700 Subject: Issue #17095: Temporarily revert getpath.c change that added the Modules directory to sys.path when running from a build directory. That has proven to be problematic for several standard library modules with C extension modules whose builds can fail on some platforms. --- Modules/getpath.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Modules/getpath.c b/Modules/getpath.c index f26b8e9..c057737 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -734,11 +734,6 @@ calculate_path(void) bufsz += wcslen(zip_path) + 1; bufsz += wcslen(exec_prefix) + 1; - /* When running from the build directory, add room for the Modules - * subdirectory too. - */ - if (efound == -1) - bufsz += wcslen(argv0_path) + wcslen(L"Modules") + 2; buf = (wchar_t *)PyMem_Malloc(bufsz * sizeof(wchar_t)); if (buf == NULL) { @@ -786,15 +781,6 @@ calculate_path(void) /* Finally, on goes the directory for dynamic-load modules */ wcscat(buf, exec_prefix); - /* And, if we run from a build directory, the Modules directory (for - * modules built with Modules/Setup.) - */ - if (efound == -1) { - wcscat(buf, delimiter); - wcscat(buf, argv0_path); - wcscat(buf, separator); - wcscat(buf, L"Modules"); - } /* And publish the results */ module_search_path = buf; -- cgit v0.12