From 3c97e1e457033bbb8bbe0b7198bd13fc794a12b0 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 11 Mar 2020 14:27:42 +0100 Subject: [PATCH] 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. --- Misc/NEWS.d/next/Build/2020-03-03-15-56-07.bpo-39761.k10aGe.rst | 1 + configure | 2 +- configure.ac | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2020-03-03-15-56-07.bpo-39761.k10aGe.rst 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 00000000000..e3f17cfbd94 --- /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 d1ec709e4f0..893d0e14149 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 38598c43853..8eed0151ebb 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