1
# DP: Fix gotools cross build.
3
* Makefile.am: Use GOC configured in configure.ac for cross builds.
4
* configure.ac: Fix NATIVE conditional.
5
* Makefile.in, configure: Regenerate.
7
Index: b/src/gotools/Makefile.am
8
===================================================================
9
--- a/src/gotools/Makefile.am
10
+++ b/src/gotools/Makefile.am
11
@@ -33,7 +33,7 @@ if NATIVE
12
# Use the compiler we just built.
13
GOCOMPILER = $(GOC_FOR_TARGET)
19
GOCFLAGS = $(CFLAGS_FOR_TARGET)
20
Index: b/src/gotools/Makefile.in
21
===================================================================
22
--- a/src/gotools/Makefile.in
23
+++ b/src/gotools/Makefile.in
24
@@ -226,7 +226,7 @@ PWD_COMMAND = $${PWDCMD-pwd}
25
STAMP = echo timestamp >
26
libgodir = ../$(target_noncanonical)/libgo
27
LIBGODEP = $(libgodir)/libgo.la
28
-@NATIVE_FALSE@GOCOMPILER = $(GOC)
29
+@NATIVE_FALSE@GOCOMPILER = @GOC@
31
# Use the compiler we just built.
32
@NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET)
33
Index: b/src/gotools/configure.ac
34
===================================================================
35
--- a/src/gotools/configure.ac
36
+++ b/src/gotools/configure.ac
37
@@ -46,7 +46,7 @@ AC_PROG_INSTALL
41
-AM_CONDITIONAL(NATIVE, test "$cross_compiling" = no)
42
+AM_CONDITIONAL(NATIVE, test "$host" = "$target")
44
dnl Test for -lsocket and -lnsl. Copied from libjava/configure.ac.
45
AC_CACHE_CHECK([for socket libraries], gotools_cv_lib_sockets,