From: Nikhil Benesch <nikhil.benesch@gmail.com>
Date: Wed, 14 Oct 2020 19:24:49 +0000 (+0000)
Subject: libgo: correct Makefile typo in path to x/net/route package
X-Git-Tag: basepoints/gcc-12~4295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6949fbefe28134744a86c5d7b8d9c17fcf3a16a0;p=thirdparty%2Fgcc.git

libgo: correct Makefile typo in path to x/net/route package

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/262342
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ce96537e3466..a7e6a7257f0d 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-94808b9af5cd9b9102ae9680a0e5f124c6793815
+d36e74c7a1aa94fc5cf393dc705b8a1271cb01c7
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 76cdc8ef217d..26e838504353 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1096,7 +1096,7 @@ if LIBGO_IS_BSD
 $(eval $(call PACKAGE_template,golang.org/x/net/route))
 
 golangorg_x_net_route_lo = \
-	golang.org/net/route.lo
+	golang.org/x/net/route.lo
 
 endif
 
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 59a7083f6149..d300ab64802e 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1153,7 +1153,7 @@ extra_check_libs_cmd_vet_internal_cfg = $(abs_builddir)/libgotool.a
 @HAVE_STAT_TIMESPEC_TRUE@@LIBGO_IS_SOLARIS_TRUE@matchargs_os = --tag=solaristag
 @LIBGO_IS_SOLARIS_FALSE@matchargs_os = 
 @LIBGO_IS_BSD_TRUE@golangorg_x_net_route_lo = \
-@LIBGO_IS_BSD_TRUE@	golang.org/net/route.lo
+@LIBGO_IS_BSD_TRUE@	golang.org/x/net/route.lo
 
 @LIBGO_IS_SOLARIS_TRUE@golangorg_x_net_lif_lo = \
 @LIBGO_IS_SOLARIS_TRUE@	golang.org/x/net/lif.lo