From 5a81ad6b22e28db62caa3a4b6a885b72c9d18021 Mon Sep 17 00:00:00 2001 From: Adam Yoblick Date: Wed, 17 Apr 2024 16:18:04 -0500 Subject: [PATCH] Rebuilt inject binaries with PROFILE linker flag --- .../windows/compile_windows.bat | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat index d65c1add..674da647 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat @@ -1,12 +1,16 @@ +:: This needs to be run from a Visual Studio Developer Command Prompt +:: You must also have the "Desktop Development with C++" workload installed + setlocal @cd /d %~dp0 -@set VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe -@echo Using vswhere at %VSWHERE% -@for /f "usebackq tokens=*" %%i in (`"%VSWHERE%" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do set VSDIR=%%i -@echo Using Visual C++ at %VSDIR% - -call "%VSDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86 -vcvars_spectre_libs=spectre +@IF NOT EXIST "%VSINSTALLDIR%VC\Auxiliary\Build\vcvarsall.bat" ( + echo "Please install Visual Studio 2017 or later with the 'Desktop Development with C++' workload" + exit /b 1 +) + +:: Build x86 binaries +call "%VSINSTALLDIR%VC\Auxiliary\Build\vcvarsall.bat" x86 -vcvars_spectre_libs=spectre cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /out:attach_x86.dll copy attach_x86.dll ..\attach_x86.dll /Y @@ -20,7 +24,8 @@ cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /PROFILE /GUARD:CF /out:inje copy inject_dll_x86.exe ..\inject_dll_x86.exe /Y copy inject_dll_x86.pdb ..\inject_dll_x86.pdb /Y -call "%VSDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 -vcvars_spectre_libs=spectre +:: Build x64 binaries +call "%VSINSTALLDIR%VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 -vcvars_spectre_libs=spectre cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /out:attach_amd64.dll copy attach_amd64.dll ..\attach_amd64.dll /Y