Skip to content

bpo-39761: dtrace build fix for Linux and non Linux systems. #18672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
devnexen wants to merge 1 commit into from
Closed

bpo-39761: dtrace build fix for Linux and non Linux systems. #18672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11457,6 +11457,10 @@ fi
$as_echo "#define WITH_DTRACE 1" >>confdefs.h

DTRACE_HEADERS="Include/pydtrace_probes.h"
DTRACE_CMD="$DTRACE $DFLAGS"
if test "$ac_sys_system" = "Linux"; then
DTRACE_CMD="$DTRACE"
fi

# On OS X, DTrace providers do not need to be explicitly compiled and
# linked into the binary. Correspondingly, dtrace(1) is missing the ELF
Expand All @@ -11469,7 +11473,7 @@ if ${ac_cv_dtrace_link+:} false; then :
else
ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d
"$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
"$DTRACE_CMD" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes

fi
Expand Down
6 changes: 5 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3517,6 +3517,10 @@ then
fi
AC_DEFINE(WITH_DTRACE, 1, [Define if you want to compile in DTrace support])
DTRACE_HEADERS="Include/pydtrace_probes.h"
DTRACE_CMD="$DTRACE $DFLAGS"
if test "$ac_sys_system" = "Linux"; then
DTRACE_CMD="$DTRACE"
fi

# On OS X, DTrace providers do not need to be explicitly compiled and
# linked into the binary. Correspondingly, dtrace(1) is missing the ELF
Expand All @@ -3526,7 +3530,7 @@ then
[ac_cv_dtrace_link], [dnl
ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d
"$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
"$DTRACE_CMD" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes
])
if test "$ac_cv_dtrace_link" = "yes"; then
Expand Down