[pushed] Re-apply "Pass PKG_CONFIG_PATH down from top-level Makefile"

Message ID 20221012031005.237446-1-simon.marchi@polymtl.ca
State New, archived
Headers
Series [pushed] Re-apply "Pass PKG_CONFIG_PATH down from top-level Makefile" |

Commit Message

Simon Marchi Oct. 12, 2022, 3:10 a.m. UTC
  From: Simon Marchi <simon.marchi@efficios.com>

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(+)


base-commit: 1639fab33b5932e1a5e88e29273996f70047da85
  

Comments

Alan Modra Oct. 12, 2022, 4:29 a.m. UTC | #1
On Tue, Oct 11, 2022 at 11:10:05PM -0400, Simon Marchi via Binutils wrote:
> From: Simon Marchi <simon.marchi@efficios.com>
> 
> 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.

Sorry, and thanks for fixing it.
  

Patch

diff --git a/configure b/configure
index 4d328b735a35..9ea8034f5d7f 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 47931ff4e9e9..8af83cc98d3c 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=