lib/proxygen
1
0
Fork 0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-07 07:02:53 +03:00
Code Activity

CMake: remove Python search path configuration

Browse Source 
Reviewed By: genevievehelsel

Differential Revision: D77164618

fbshipit-source-id: ee36919d63c672613a5ce375b280f55e00b37c2b
This commit is contained in:
Zeyi (Rice) Fan
2025-06-30 13:26:04 -07:00
committed by Facebook GitHub Bot
parent 5d52f3eb35
commit 8939972728
1 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
build/fbcode_builder/CMake/fb_py_win_main.c
View File

@@ -10,34 +10,6 @@
typedef int (*Py_Main)(int, wchar_t**);
// Add the given path to Windows's DLL search path.
// For Windows DLL search path resolution, see:
// https://docs.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-search-order
void add_search_path(const wchar_t* path) {
wchar_t buffer[PATH_SIZE];
wchar_t** lppPart = NULL;
if (!GetFullPathNameW(path, PATH_SIZE, buffer, lppPart)) {
fwprintf(
stderr,
L"warning: %d unable to expand path %s\n",
GetLastError(),
path);
return;
}
if (!AddDllDirectory(buffer)) {
DWORD error = GetLastError();
if (error != ERROR_FILE_NOT_FOUND) {
fwprintf(
stderr,
L"warning: %d unable to set DLL search path for %s\n",
GetLastError(),
path);
}
}
}
int locate_py_main(int argc, wchar_t** argv) {
/*
* We have to dynamically locate Python3.dll because we may be loading a
@@ -51,16 +23,6 @@ int locate_py_main(int argc, wchar_t** argv) {
HINSTANCE python_dll;
Py_Main pymain;
// last added directory has highest priority
add_search_path(L"C:\\Python36\\");
add_search_path(L"C:\\tools\\fb-python\\fb-python36\\");
add_search_path(L"C:\\Python37\\");
add_search_path(L"C:\\tools\\fb-python\\fb-python37\\");
add_search_path(L"C:\\Python38\\");
add_search_path(L"C:\\tools\\fb-python\\fb-python38\\");
// TODO(T123615656): Re-enable Python 3.9 after the fix
// add_search_path(L"C:\\tools\\fb-python\\fb-python39\\");
python_dll =
LoadLibraryExW(L"python3.dll", NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);