Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions build_attach_binaries.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This script is used for building the pydevd binaries
import argparse
import os
import platform

def build_pydevd_binaries(force: bool):
os.environ["PYDEVD_USE_CYTHON"] = "yes"
Expand All @@ -20,16 +21,19 @@ def build_pydevd_binaries(force: bool):

# Run the appropriate batch script to build the binaries if necessary.
pydevd_attach_to_process_root = os.path.join(pydevd_root, "pydevd_attach_to_process")
if os.name == "nt":
if platform.system() == "Windows":
if not os.path.exists(os.path.join(pydevd_attach_to_process_root, "attach_amd64.dll")) or force:
os.system(os.path.join(pydevd_attach_to_process_root, "windows", "compile_windows.bat"))
elif os.name == "posix":
elif platform.system() == "Linux":
if not os.path.exists(os.path.join(pydevd_attach_to_process_root, "attach_linux_amd64.so")) or force:
os.system(os.path.join(pydevd_attach_to_process_root, "linux_and_mac", "compile_linux.sh"))
else:
if not os.path.exists(os.path.join(pydevd_attach_to_process_root, "attach_x86_64.dylib")) or force:
elif platform.system() == "Darwin":
if not os.path.exists(os.path.join(pydevd_attach_to_process_root, "attach.dylib")) or force:
os.system(os.path.join(pydevd_attach_to_process_root, "linux_and_mac", "compile_mac.sh"))

else:
print("unsupported platform.system(): {}".format(platform.system()))
exit(1)


if __name__ == "__main__":
arg_parser = argparse.ArgumentParser(description="Build the pydevd binaries.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def get_target_filename(is_target_process_64=None, prefix=None, extension=None):
print("Unable to attach to process in platform: %s", sys.platform)
return None

if arch.lower() not in ("amd64", "x86", "x86_64", "i386", "x86"):
if arch.lower() not in ("arm64", "amd64", "x86", "x86_64", "i386", "x86"):
# We don't support this processor by default. Still, let's support the case where the
# user manually compiled it himself with some heuristics.
#
Expand Down Expand Up @@ -237,8 +237,11 @@ def get_target_filename(is_target_process_64=None, prefix=None, extension=None):

if not prefix:
# Default is looking for the attach_ / attach_linux
if IS_WINDOWS or IS_MAC: # just the extension changes
if IS_WINDOWS: # just the extension changes
prefix = "attach_"
elif IS_MAC:
prefix = "attach"
suffix = ""
elif IS_LINUX:
prefix = "attach_linux_" # historically it has a different name
else:
Expand Down Expand Up @@ -525,7 +528,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d
cmd.extend(
[
"-o 'process detach'",
"-o 'script import os; os._exit(1)'",
"-o 'script import os; os._exit(0)'",
]
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
set -e
SRC="$(dirname "$0")/.."
g++ -fPIC -D_REENTRANT -std=c++11 -D_FORTIFY_SOURCE=2 -arch x86_64 -c $SRC/linux_and_mac/attach.cpp -o $SRC/attach_x86_64.o
g++ -dynamiclib -nostartfiles -arch x86_64 -lc $SRC/attach_x86_64.o -o $SRC/attach_x86_64.dylib
#!/bin/bash
set -euxo pipefail

clang++ -fPIC -D_REENTRANT -std=c++11 -arch arm64 -c -o attach_arm64.o attach.cpp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume clang supports D_FORTIFY_SOURCE?. We have internal requirements on this flag being set or Microsoft security won't let us ship this binary. Can you try adding it back?

Copy link
Contributor

@rchiodo rchiodo Jun 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And why use clang instead of g++? Could you continue to use g++ to create the other arch, and then just add the lipo command?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SRC to attach.cpp is off. Should likely be this: $SRC/linux_and_mac/attach.cpp. I believe that's what is causing the build failure in the pipeline.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The build script was pulled from JetBrains/intellij-community@2e7109f. I've pushed up a new version that is more like the original.

clang++ -dynamiclib -nostartfiles -arch arm64 -o attach_arm64.dylib attach_arm64.o -lc
rm attach_arm64.o

clang++ -fPIC -D_REENTRANT -std=c++11 -arch x86_64 -c -o attach_x86_64.o attach.cpp
clang++ -dynamiclib -nostartfiles -arch x86_64 -o attach_x86_64.dylib attach_x86_64.o -lc
rm attach_x86_64.o

lipo -create attach_arm64.dylib attach_x86_64.dylib -output attach.dylib
rm attach_arm64.dylib attach_x86_64.dylib
mv attach.dylib ../attach.dylib
5 changes: 3 additions & 2 deletions src/debugpy/_vendored/pydevd/pydevd_tracing.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ def get_python_helper_lib_filename():
pydev_log.info("Unable to set trace to all threads in platform: %s", sys.platform)
return None

if arch.lower() not in ("amd64", "x86", "x86_64", "i386", "x86"):
if arch.lower() not in ("arm64", "amd64", "x86", "x86_64", "i386", "x86"):
# We don't support this processor by default. Still, let's support the case where the
# user manually compiled it himself with some heuristics.
#
Expand Down Expand Up @@ -251,7 +251,8 @@ def get_python_helper_lib_filename():
suffix = suffix_32

if IS_WINDOWS or IS_MAC: # just the extension changes
prefix = "attach_"
prefix = "attach"
suffix = ""
elif IS_LINUX: #
prefix = "attach_linux_" # historically it has a different name
else:
Expand Down
Loading