re PR go/80814 (commit aa443150c83535fedccb3dee80daa7e01fafd92d causes a build error.)
PR go/80814 * Makefile.am (AM_GOCFLAGS): Define. * Makefile.in: Rebuild. From-SVN: r248255
This commit is contained in:
committed by
Ian Lance Taylor
parent
52e14b96bd
commit
afbc9ecbf6
@@ -1,3 +1,9 @@
|
|||||||
|
2017-05-18 Ian Lance Taylor <iant@golang.org>
|
||||||
|
|
||||||
|
PR go/80814
|
||||||
|
* Makefile.am (AM_GOCFLAGS): Define.
|
||||||
|
* Makefile.in: Rebuild.
|
||||||
|
|
||||||
2017-01-13 Ian Lance Taylor <iant@golang.org>
|
2017-01-13 Ian Lance Taylor <iant@golang.org>
|
||||||
|
|
||||||
Updates for Go 1.8rc1.
|
Updates for Go 1.8rc1.
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ endif
|
|||||||
GOCFLAGS = $(CFLAGS_FOR_TARGET)
|
GOCFLAGS = $(CFLAGS_FOR_TARGET)
|
||||||
GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
|
GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
|
||||||
|
|
||||||
|
AM_GOCFLAGS = -I $(libgodir)
|
||||||
AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs
|
AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs
|
||||||
GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
|
GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -258,6 +258,7 @@ LIBGODEP = $(libgodir)/libgo.la
|
|||||||
# Use the compiler we just built.
|
# Use the compiler we just built.
|
||||||
@NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET)
|
@NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET)
|
||||||
GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
|
GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
|
||||||
|
AM_GOCFLAGS = -I $(libgodir)
|
||||||
AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs
|
AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs
|
||||||
GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
|
GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
|
||||||
cmdsrcdir = $(srcdir)/../libgo/go/cmd
|
cmdsrcdir = $(srcdir)/../libgo/go/cmd
|
||||||
@@ -565,8 +566,8 @@ distclean-generic:
|
|||||||
maintainer-clean-generic:
|
maintainer-clean-generic:
|
||||||
@echo "This command is intended for maintainers to use"
|
@echo "This command is intended for maintainers to use"
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
@NATIVE_FALSE@uninstall-local:
|
|
||||||
@NATIVE_FALSE@install-exec-local:
|
@NATIVE_FALSE@install-exec-local:
|
||||||
|
@NATIVE_FALSE@uninstall-local:
|
||||||
clean: clean-am
|
clean: clean-am
|
||||||
|
|
||||||
clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
|
clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
|
||||||
|
|||||||
Reference in New Issue
Block a user