This libgo patch by Nikhil Benesch corrects a Makefile typo in the path to the x/net/route package. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline.
Ian
6949fbefe28134744a86c5d7b8d9c17fcf3a16a0 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index ce96537e346..a7e6a7257f0 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 76cdc8ef217..26e83850435 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
