Patchwork [gccgo] Change configure variable from GCCGO to GOC

login
register
mail settings
Submitter Ian Taylor
Date Nov. 3, 2010, 8:04 p.m.
Message ID <mcreib2kwbw.fsf@google.com>
Download mbox | patch
Permalink /patch/70060/
State New
Headers show

Comments

Ian Taylor - Nov. 3, 2010, 8:04 p.m.
I've been using GCCGO as the name of the shell/make variable for the Go
compiler, analogous to CC, CXX, GCJ, etc.  Ralf Wildenhues and Eric
Blake suggested that I use GOC instead.  These two patches implement
that change.  Committed to gccgo branch.

Ian

Patch

diff -r 7c78c9ee57a4 libgo/Makefile.am
--- a/libgo/Makefile.am	Wed Nov 03 11:05:33 2010 -0700
+++ b/libgo/Makefile.am	Wed Nov 03 13:03:11 2010 -0700
@@ -56,9 +56,9 @@ 
 	"CXXFLAGS=$(CXXFLAGS)" \
 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-	"GCCGO_FOR_TARGET=$(GCCGO_FOR_TARGET)" \
-	"GCCGO=$(GCCGO)" \
-	"GOFLAGS=$(GOFLAGS)" \
+	"GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
+	"GOC=$(GOC)" \
+	"GOCFLAGS=$(GOCFLAGS)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -1191,15 +1191,15 @@ 
 
 LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
 
-GOFLAGS = $(CFLAGS)
-AM_GOFLAGS = $(STRINGOPS_FLAG)
-GOCOMPILE = $(GCCGO) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_GOFLAGS) $(GOFLAGS)
+GOCFLAGS = $(CFLAGS)
+AM_GOCFLAGS = $(STRINGOPS_FLAG)
+GOCOMPILE = $(GOC) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_GOCFLAGS) $(GOCFLAGS)
 
-LTGOCOMPILE = $(LIBTOOL) --tag GO --mode=compile $(GCCGO) $(INCLUDES) \
-	$(AM_GOFLAGS) $(GOFLAGS)
+LTGOCOMPILE = $(LIBTOOL) --tag GO --mode=compile $(GOC) $(INCLUDES) \
+	$(AM_GOCFLAGS) $(GOCFLAGS)
 
-GOLINK = $(LIBTOOL) --tag GO --mode-link $(GCCGO) \
-	$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_GOFLAGS) $(LTLDFLAGS) \
+GOLINK = $(LIBTOOL) --tag GO --mode-link $(GOC) \
+	$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_GOCFLAGS) $(LTLDFLAGS) \
 	-lpthread -o $@
 
 # Build a package.
@@ -1224,7 +1224,7 @@ 
 
 # Check a package.
 CHECK = \
-	@GC="$(GCCGO) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs -Wl,-R,`${PWD_COMMAND}`/.libs"; \
+	@GC="$(GOC) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs -Wl,-R,`${PWD_COMMAND}`/.libs"; \
 	export GC; \
 	RUNTESTFLAGS="$(RUNTESTFLAGS)"; \
 	export RUNTESTFLAGS; \