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.

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 (file)
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.

diff --git a/configure b/configure
index d1ec709e4f006f0e614cf1a8cecd28e70c514987..893d0e1414917705e4d2daefd58385718db6fed5 100755 (executable)
--- 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 38598c438539d277c15aae1b90e088c8f2c26027..8eed0151ebb4192d809a20582f53cdbe0ac850e9 100644 (file)
--- 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