[PATCH] libgcc: Quote variable in Makefile.in

[PATCH] libgcc: Quote variable in Makefile.in

[Jonathan Wakely]

This isn't very important as the error is harmless, but it's easy to fix
and so is one less thing that might confuse people when looking at build
logs.

OK for trunk?

-- >8 --

If the xgcc executable has not been built (or has been removed by 'make
clean') then the command to print the multilib dir fails, and so the
MULTIOSDIR variable is empty. That then causes:
/bin/sh: line 0: test: !=: unary operator expected

We can avoid it by quoting the variable.

libgcc/ChangeLog:

	* Makefile.in: Quote variable.
---
 libgcc/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index 1fe708a93f7..6e2a0470944 100644
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -310,7 +310,7 @@ CRTSTUFF_T_CFLAGS =
 MULTIDIR := $(shell $(CC) $(CFLAGS) -print-multi-directory)
 MULTIOSDIR := $(shell $(CC) $(CFLAGS) -print-multi-os-directory)
 
-MULTIOSSUBDIR := $(shell if test $(MULTIOSDIR) != .; then echo /$(MULTIOSDIR); fi)
+MULTIOSSUBDIR := $(shell if test "$(MULTIOSDIR)" != .; then echo /$(MULTIOSDIR); fi)
 inst_libdir = $(libsubdir)$(MULTISUBDIR)
 inst_slibdir = $(slibdir)$(MULTIOSSUBDIR)
 
-- 
2.37.3

Re: [PATCH] libgcc: Quote variable in Makefile.in

[Jeff Law]

On 10/12/22 05:52, Jonathan Wakely via Gcc-patches wrote:
> This isn't very important as the error is harmless, but it's easy to fix
> and so is one less thing that might confuse people when looking at build
> logs.
>
> OK for trunk?
>
> -- >8 --
>
> If the xgcc executable has not been built (or has been removed by 'make
> clean') then the command to print the multilib dir fails, and so the
> MULTIOSDIR variable is empty. That then causes:
> /bin/sh: line 0: test: !=: unary operator expected
>
> We can avoid it by quoting the variable.
>
> libgcc/ChangeLog:
>
> 	* Makefile.in: Quote variable.

OK

jeff