diff mbox series

build: Fix "make install" for MinGW

Message ID 20240630210927.1884960-1-lhyatt@gmail.com
State Committed
Commit bd9c550acc42c5b04a61be3c8d981359b2093357
Headers
Series build: Fix "make install" for MinGW |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Test passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Test passed

Commit Message

Lewis Hyatt June 30, 2024, 9:09 p.m. UTC 
  Hello-

I noticed this while trying to test another patch on Windows (using the
MSYS2 environment). Tested that it fixes the issue for x86_64-w64-mingw32
and doesn't affect anything for x86_64-pc-linux-gnu. It looks like the same
fix for C was applied back in r11-702. OK? Thanks...

-Lewis

-- >8 --

Since r8-4925, the "make install" recipe generates a path which can start
with "//", causing problems for some Windows environments. Fix by removing
the redundant slash.
---
 gcc/cp/Make-lang.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jason Merrill July 1, 2024, 6:45 p.m. UTC | #1 
On 6/30/24 5:09 PM, Lewis Hyatt wrote:
> Hello-
> 
> I noticed this while trying to test another patch on Windows (using the
> MSYS2 environment). Tested that it fixes the issue for x86_64-w64-mingw32
> and doesn't affect anything for x86_64-pc-linux-gnu. It looks like the same
> fix for C was applied back in r11-702. OK? Thanks...

OK.

> -Lewis
> 
> -- >8 --
> 
> Since r8-4925, the "make install" recipe generates a path which can start
> with "//", causing problems for some Windows environments. Fix by removing
> the redundant slash.
> ---
>   gcc/cp/Make-lang.in | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
> index 026cf8d7088..e792ea4ddf3 100644
> --- a/gcc/cp/Make-lang.in
> +++ b/gcc/cp/Make-lang.in
> @@ -344,7 +344,7 @@ c++.install-plugin: installdirs
>   # Install import library.
>   ifeq ($(plugin_implib),yes)
>   	$(mkinstalldirs) $(DESTDIR)$(plugin_resourcesdir)
> -	$(INSTALL_DATA) cc1plus$(exeext).a $(DESTDIR)/$(plugin_resourcesdir)/cc1plus$(exeext).a
> +	$(INSTALL_DATA) cc1plus$(exeext).a $(DESTDIR)$(plugin_resourcesdir)/cc1plus$(exeext).a
>   endif
>   
>   c++.uninstall:
>
diff mbox series

Patch

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 026cf8d7088..e792ea4ddf3 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -344,7 +344,7 @@  c++.install-plugin: installdirs
 # Install import library.
 ifeq ($(plugin_implib),yes)
 	$(mkinstalldirs) $(DESTDIR)$(plugin_resourcesdir)
-	$(INSTALL_DATA) cc1plus$(exeext).a $(DESTDIR)/$(plugin_resourcesdir)/cc1plus$(exeext).a
+	$(INSTALL_DATA) cc1plus$(exeext).a $(DESTDIR)$(plugin_resourcesdir)/cc1plus$(exeext).a
 endif
 
 c++.uninstall: