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

encukou · web-flow · commit 3c97e1e45703 · 2020-03-11T14:27:42.000+01:00
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
@@ -0,0 +1 @@
+Fix build with DTrace but without additional DFLAGS.
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix build with DTrace but without additional DFLAGS.`