libgo: correct golang_org Makefile variables not used on all systems

    Patch by Rainer Orth.

    Reviewed-on: https://go-review.googlesource.com/35238

From-SVN: r244483

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 61359d33d484e1e73910dda297cfbb24ec3fcd8a..35c0275f2eefba5d941e9edded6877bac36a4745 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ea73a80a6047f477d92fccc7de143a3ee1021c65
+a28b04adaeff8de61c336374db66b24ed96c30f0
 
 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 0d9b7a7f6ad0e972e90945a48ed0cf4c2ae37ad0..14ee9bec2113b9a85b2da90235e258967bc54ef5 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1132,7 +1132,7 @@ if LIBGO_IS_BSD
 $(eval $(call PACKAGE_template,golang_org/x/net/route))
 
 golang_org_x_net_route_lo = \
-       golang_org/x/net/route/route.lo
+       golang_org/x/net/route.lo
 golang_org_x_net_route_check = \
        golang_org/x/net/route/check
 
@@ -1145,7 +1145,7 @@ if LIBGO_IS_SOLARIS
 $(eval $(call PACKAGE_template,golang_org/x/net/lif))
 
 golang_org_x_net_lif_lo = \
-       golang_org/x/net/lif/lif.lo
+       golang_org/x/net/lif.lo
 golang_org_x_net_lif_check = \
        golang_org/x/net/lif/check
 

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 4b46076b010df151e905b8f83ef31507f1dc8ad9..e3e396caaebba6da1b1196935d890a2091db6c5b 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1172,13 +1172,13 @@ extra_go_files_runtime_internal_sys = version.go
 @HAVE_STAT_TIMESPEC_TRUE@@LIBGO_IS_SOLARIS_TRUE@matchargs_os = --tag=solaristag
 @LIBGO_IS_SOLARIS_FALSE@matchargs_os = 
 @LIBGO_IS_BSD_TRUE@golang_org_x_net_route_lo = \
-@LIBGO_IS_BSD_TRUE@    golang_org/x/net/route/route.lo
+@LIBGO_IS_BSD_TRUE@    golang_org/x/net/route.lo
 
 @LIBGO_IS_BSD_TRUE@golang_org_x_net_route_check = \
 @LIBGO_IS_BSD_TRUE@    golang_org/x/net/route/check
 
 @LIBGO_IS_SOLARIS_TRUE@golang_org_x_net_lif_lo = \
-@LIBGO_IS_SOLARIS_TRUE@        golang_org/x/net/lif/lif.lo
+@LIBGO_IS_SOLARIS_TRUE@        golang_org/x/net/lif.lo
 
 @LIBGO_IS_SOLARIS_TRUE@golang_org_x_net_lif_check = \
 @LIBGO_IS_SOLARIS_TRUE@        golang_org/x/net/lif/check