diff options
| author | Petr Viktorin <encukou@gmail.com> | 2020-03-11 13:27:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 13:27:42 (GMT) |
| commit | 3c97e1e457033bbb8bbe0b7198bd13fc794a12b0 (patch) | |
| tree | b968f087b7e12cb83c3e9e8ab569b5bfcb6f7fe0 | |
| parent | 2dd41740c97bd77695ddcc590caa7f53e76dc35a (diff) | |
| download | cpython-3c97e1e457033bbb8bbe0b7198bd13fc794a12b0.zip cpython-3c97e1e457033bbb8bbe0b7198bd13fc794a12b0.tar.gz cpython-3c97e1e457033bbb8bbe0b7198bd13fc794a12b0.tar.bz2 | |
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.
| -rw-r--r-- | Misc/NEWS.d/next/Build/2020-03-03-15-56-07.bpo-39761.k10aGe.rst | 1 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Build/2020-03-03-15-56-07.bpo-39761.k10aGe.rst b/Misc/NEWS.d/next/Build/2020-03-03-15-56-07.bpo-39761.k10aGe.rst new file mode 100644 index 0000000..e3f17cf --- /dev/null +++ b/Misc/NEWS.d/next/Build/2020-03-03-15-56-07.bpo-39761.k10aGe.rst @@ -0,0 +1 @@ +Fix build with DTrace but without additional DFLAGS. @@ -11487,7 +11487,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" $DFLAGS -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ ac_cv_dtrace_link=yes fi diff --git a/configure.ac b/configure.ac index 38598c4..8eed015 100644 --- a/configure.ac +++ b/configure.ac @@ -3541,7 +3541,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" $DFLAGS -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ ac_cv_dtrace_link=yes ]) if test "$ac_cv_dtrace_link" = "yes"; then |