traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-39761: Fix dtrace build with empty $DFLAGS (GH-18766) 

This fixes a regression introduced in bpo-38960.

When DFLAGS was empty, "$DFLAGS" results in an empty argument ("").
Without the quotes, an empty variable will be ignored by the shell.
This commit is contained in:
Petr Viktorin 2020-03-11 14:27:42 +01:00 committed by GitHub
parent 2dd41740c9
commit 3c97e1e457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2020-03-03-15-56-07.bpo-39761.k10aGe.rst Normal file
View File

@ -0,0 +1 @@
Fix build with DTrace but without additional DFLAGS.

2
configure vendored
View File

@ -11487,7 +11487,7 @@ if ${ac_cv_dtrace_link+:} false; then :
else else
ac_cv_dtrace_link=no ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d echo 'BEGIN{}' > conftest.d
"$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ "$DTRACE" $DFLAGS -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes ac_cv_dtrace_link=yes
fi fi

2
configure.ac
View File

@ -3541,7 +3541,7 @@ then
[ac_cv_dtrace_link], [dnl [ac_cv_dtrace_link], [dnl
ac_cv_dtrace_link=no ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d echo 'BEGIN{}' > conftest.d
"$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ "$DTRACE" $DFLAGS -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes ac_cv_dtrace_link=yes
]) ])
if test "$ac_cv_dtrace_link" = "yes"; then if test "$ac_cv_dtrace_link" = "yes"; then