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 ce96537e3466eca170ffb9120dea09deab440b4e..a7e6a7257f0d7a27d0fab71af77b2473d596d3d5 100644 (file)
--- 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 76cdc8ef217d3fd662af0faaf6af2ca4195a0ac0..26e838504353c1ed7f81be85f2e842966adcee39 100644 (file)
--- 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 59a7083f6149a9a21be7eb9378575a0a662deddb..d300ab64802eaec9ce0d09db74734017172a49af 100644 (file)
--- 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