[Python-checkins] bpo-39761: Fix dtrace build with empty $DFLAGS (GH-18766)

[Petr Viktorin]

https://github.com/python/cpython/commit/3c97e1e457033bbb8bbe0b7198bd13fc794a12b0
commit: 3c97e1e457033bbb8bbe0b7198bd13fc794a12b0
branch: master
author: Petr Viktorin <encukou at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020-03-11T14:27:42+01:00
summary:

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.

files:
A Misc/NEWS.d/next/Build/2020-03-03-15-56-07.bpo-39761.k10aGe.rst
M configure
M configure.ac

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 0000000000000..e3f17cfbd9493
--- /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.
diff --git a/configure b/configure
index d1ec709e4f006..893d0e1414917 100755
--- a/configure
+++ b/configure
@@ -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 38598c438539d..8eed0151ebb41 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