From 9e65489ac29a2b38417c4f17acf82187343751a6 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Fri, 8 Apr 2022 10:56:41 -0400
Subject: [PATCH] Re-apply "Pass PKG_CONFIG_PATH down from top-level Makefile"

Commit 228cf97dd3c8 ("Merge configure.ac from gcc project") undid the
change originally done in de83289ef32e ("Pass PKG_CONFIG_PATH down from
top-level Makefile").  Re-apply it.

Change-Id: I91138dfca41c43b05e53e445f62e4b27882536bf
---
 configure    | 2 ++
 configure.ac | 1 +
 2 files changed, 3 insertions(+)

diff --git a/configure b/configure
index 4d328b735a3..9ea8034f5d7 100755
--- a/configure
+++ b/configure
@@ -621,6 +621,7 @@ CXX_FOR_TARGET
 CC_FOR_TARGET
 RANLIB_PLUGIN_OPTION
 AR_PLUGIN_OPTION
+PKG_CONFIG_PATH
 GDCFLAGS
 READELF
 OTOOL
@@ -12932,6 +12933,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -plugin option" >&5
 $as_echo_n "checking for -plugin option... " >&6; }
 
diff --git a/configure.ac b/configure.ac
index 47931ff4e9e..8af83cc98d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3654,6 +3654,7 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(GDC)
 AC_SUBST(GDCFLAGS)
+AC_SUBST(PKG_CONFIG_PATH)
 
 GCC_PLUGIN_OPTION(PLUGIN_OPTION)
 AR_PLUGIN_OPTION=
-- 
2.30.2