[gcc r14-8249] Darwin, configure: Handle a missing substitution.

Iain D Sandoe iains@gcc.gnu.org
Thu Jan 18 15:04:15 GMT 2024


https://gcc.gnu.org/g:569ebd6bdd45cb5f90634c93e9623d96928b4fce

commit r14-8249-g569ebd6bdd45cb5f90634c93e9623d96928b4fce
Author: Iain Sandoe <iain@sandoe.co.uk>
Date:   Thu Jan 18 09:56:42 2024 +0000

    Darwin, configure: Handle a missing substitution.
    
    The configure substitution for enable_darwin_at_rpath has been
    omitted, which leads to a failure to set ENABLE_DARWIN_AT_RPATH in
    the testsuite site.exp (which leads to failure to add -B options
    in some cases, breaking uninstalled testing there).
    
    Since we already have substitutions for ENABLE_DARWIN_AT_RPATH_TRUE
    we can use that instead, which is what this patch does.
    
    gcc/ChangeLog:
    
            * Makefile.in: Emit ENABLE_DARWIN_AT_RPATH into site.exp
            when ENABLE_DARWIN_AT_RPATH_TRUE is not '#'.
    
    Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

Diff:
---
 gcc/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index deb12e17d25..95caa54a52b 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -4303,7 +4303,7 @@ site.exp: ./config.status Makefile
 	  echo "set COMPAT_OPTIONS \"$(COMPAT_OPTIONS)\"" >> ./site.tmp; \
 	else true; \
 	fi
-	@if test "x@enable_darwin_at_rpath@" = "xyes" ; then \
+	@if test "X@ENABLE_DARWIN_AT_RPATH_TRUE@" != "X#" ; then \
 	  echo "set ENABLE_DARWIN_AT_RPATH 1" >> ./site.tmp; \
 	fi
 	@echo "## All variables above are generated by configure. Do Not Edit ##" >> ./site.tmp


More information about the Gcc-cvs mailing list