diff mbox series

[pushed] Darwin, configure: Handle a missing substitution.

Message ID 20240118150708.25205-1-iain@sandoe.co.uk
State New
Headers
Series [pushed] Darwin, configure: Handle a missing substitution. |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_build--master-arm warning Patch is already merged

Commit Message

Iain Sandoe Jan. 18, 2024, 3:07 p.m. UTC 
  Tested on x86_64 Darwin21 (has default rpath) and i686 darwin9 and
x86_64 Linux (no @rpath), pushed to trunk, thanks,
Iain

--- 8< ---

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>
---
 gcc/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

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