build: move the "-c" flag into HOST_CFLAGS

On Plan 9 this flag is used to discover
constant expressions in "if" statements.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5601060

diff --git a/src/Make.ccmd b/src/Make.ccmd
index 40cc3a0e8a2d0751bc6e42c9b27d7dc0ae19051b..ad31944225a5ac66a51e7da239182277de4ca185 100644 (file)
--- a/src/Make.ccmd
+++ b/src/Make.ccmd
@@ -38,7 +38,7 @@ all: $(TARG)
 
 # Use $(PWD)/$*.c so that gdb shows full path in stack traces.
 %.$(HOST_O): %.c
-       $(HOST_CC) $(HOST_CFLAGS) -c "$(PWD)/$*.c"
+       $(HOST_CC) $(HOST_CFLAGS) "$(PWD)/$*.c"
 
 # These are used by enough different Makefiles to be
 # worth writing down in one place, even if they don't

diff --git a/src/Make.clib b/src/Make.clib
index 4a7ea02d9bf7af8e4e4edf5e490b653a30fd15d5..367aa998e0c81731168763b59e002d6d2c91451b 100644 (file)
--- a/src/Make.clib
+++ b/src/Make.clib
@@ -8,7 +8,7 @@ all: $(LIB)
 
 # Use $(PWD)/$*.c so that gdb shows full path in stack traces.
 %.$(HOST_O): %.c
-       $(HOST_CC) $(HOST_CFLAGS) -c "$(PWD)/$*.c"
+       $(HOST_CC) $(HOST_CFLAGS) "$(PWD)/$*.c"
 
 $(OFILES): $(HFILES)
 

diff --git a/src/Make.ctool b/src/Make.ctool
index 715fab62ae811907b7505bf1e62217eec428d935..4257ca422d9bad56f76e8a01c5492b9b7eb008f3 100644 (file)
--- a/src/Make.ctool
+++ b/src/Make.ctool
@@ -40,7 +40,7 @@ all: $(TARG)
 
 # Use $(PWD)/$*.c so that gdb shows full path in stack traces.
 %.$(HOST_O): %.c
-       $(HOST_CC) $(HOST_CFLAGS) -c "$(PWD)/$*.c"
+       $(HOST_CC) $(HOST_CFLAGS) "$(PWD)/$*.c"
 
 # These are used by enough different Makefiles to be
 # worth writing down in one place, even if they don't

diff --git a/src/Make.inc b/src/Make.inc
index 1853b9465f785308de4cbb75d26495aca488663d..580350e2c81ae723a1cdea55afa0006ac58cba41 100644 (file)
--- a/src/Make.inc
+++ b/src/Make.inc
@@ -122,7 +122,7 @@ HOST_EXTRA_LDFLAGS?=
 # The -fno-common here is not necessary, but some compilers
 # on OS X seem to set it by default.  Setting it here keeps the build
 # working in that non-standard context.
-HOST_CFLAGS=-fno-common -I"$(GOROOT)/include" $(HOST_EXTRA_CFLAGS)
+HOST_CFLAGS=-c -fno-common -I"$(GOROOT)/include" $(HOST_EXTRA_CFLAGS)
 HOST_LDFLAGS=$(HOST_EXTRA_LDFLAGS)
 PWD=$(shell pwd)
 

diff --git a/src/cmd/5c/Makefile b/src/cmd/5c/Makefile
index cded7f422bda3b1c03f1c4b7b7c3984fef7ce0c8..60268e1c955c7ffb9c68d11ab67232812f1697b1 100644 (file)
--- a/src/cmd/5c/Makefile
+++ b/src/cmd/5c/Makefile
@@ -31,4 +31,4 @@ LIB=\
 include ../../Make.ctool
 
 %.$O: ../cc/%.c
-       $(HOST_CC) $(HOST_CFLAGS) -c -I. -o $@ ../cc/$*.c
+       $(HOST_CC) $(HOST_CFLAGS) -I. -o $@ ../cc/$*.c

diff --git a/src/cmd/5g/Makefile b/src/cmd/5g/Makefile
index 8f86f1143815cf7595aa481b917df0c54ab5379f..3c2a65fdf149559b30a6caed79b39080a7bb7aaa 100644 (file)
--- a/src/cmd/5g/Makefile
+++ b/src/cmd/5g/Makefile
@@ -33,4 +33,4 @@ LIB=\
 include ../../Make.ctool
 
 %.$O: ../gc/%.c
-       $(HOST_CC) $(HOST_CFLAGS) -c -I. -o $@ ../gc/$*.c
+       $(HOST_CC) $(HOST_CFLAGS) -I. -o $@ ../gc/$*.c

diff --git a/src/cmd/5l/Makefile b/src/cmd/5l/Makefile
index d116bf9c424bceed567a8cc594b165f85f4f6c2c..b68190d12a027f90aca3848141cf3663104f6621 100644 (file)
--- a/src/cmd/5l/Makefile
+++ b/src/cmd/5l/Makefile
@@ -40,4 +40,4 @@ enam.c: 5.out.h
 CLEANFILES+=enam.c
 
 %.$O: ../ld/%.c
-       $(HOST_CC) $(HOST_CFLAGS) -c -I. ../ld/$*.c
+       $(HOST_CC) $(HOST_CFLAGS) -I. ../ld/$*.c

diff --git a/src/cmd/6c/Makefile b/src/cmd/6c/Makefile
index fbc237b7502f352a7b7ad3872ff600dbb515e592..e78b2b1aaa68b6122c04d93bba669da9ec1d9683 100644 (file)
--- a/src/cmd/6c/Makefile
+++ b/src/cmd/6c/Makefile
@@ -33,4 +33,4 @@ LIB=\
 include ../../Make.ctool
 
 %.$O: ../cc/%.c
-       $(HOST_CC) $(HOST_CFLAGS) -c -I. -o $@ ../cc/$*.c
+       $(HOST_CC) $(HOST_CFLAGS) -I. -o $@ ../cc/$*.c

diff --git a/src/cmd/6g/Makefile b/src/cmd/6g/Makefile
index 52e6d3699100284bab8f2c2dfb7af1e04541018b..870984a8c6662c00a634d019fa48dec85b9dcf9c 100644 (file)
--- a/src/cmd/6g/Makefile
+++ b/src/cmd/6g/Makefile
@@ -32,4 +32,4 @@ LIB=\
 include ../../Make.ctool
 
 %.$O: ../gc/%.c
-       $(HOST_CC) $(HOST_CFLAGS) -c -I. -o $@ ../gc/$*.c
+       $(HOST_CC) $(HOST_CFLAGS) -I. -o $@ ../gc/$*.c

diff --git a/src/cmd/6l/Makefile b/src/cmd/6l/Makefile
index 612d7e8ad6c685cf7a0251866f46515b98bab5c9..43ad9cad034b9500faab56c7703b43c8cf0f4494 100644 (file)
--- a/src/cmd/6l/Makefile
+++ b/src/cmd/6l/Makefile
@@ -45,4 +45,4 @@ enam.c: 6.out.h
 CLEANFILES+=enam.c
 
 %.$O: ../ld/%.c
-       $(HOST_CC) $(HOST_CFLAGS) -c -I. ../ld/$*.c
+       $(HOST_CC) $(HOST_CFLAGS) -I. ../ld/$*.c

diff --git a/src/cmd/8c/Makefile b/src/cmd/8c/Makefile
index 150937147f357c34e4b7ca13af7e513a9e197654..f078fbdf587cf55b1e84e0124603c0d17260197a 100644 (file)
--- a/src/cmd/8c/Makefile
+++ b/src/cmd/8c/Makefile
@@ -34,4 +34,4 @@ LIB=\
 include ../../Make.ctool
 
 %.$O: ../cc/%.c
-       $(HOST_CC) $(HOST_CFLAGS) -c -I. -o $@ ../cc/$*.c
+       $(HOST_CC) $(HOST_CFLAGS) -I. -o $@ ../cc/$*.c

diff --git a/src/cmd/8g/Makefile b/src/cmd/8g/Makefile
index fd3e30aad502bd132307670bbddc031380d7c8ba..617cf1bb689f97869d39eb8c1a962b15832a796e 100644 (file)
--- a/src/cmd/8g/Makefile
+++ b/src/cmd/8g/Makefile
@@ -33,4 +33,4 @@ LIB=\
 include ../../Make.ctool
 
 %.$O: ../gc/%.c
-       $(HOST_CC) $(HOST_CFLAGS) -c -I. -o $@ ../gc/$*.c
+       $(HOST_CC) $(HOST_CFLAGS) -I. -o $@ ../gc/$*.c

diff --git a/src/cmd/8l/Makefile b/src/cmd/8l/Makefile
index 4af72e6ae6f9a6c2d77d98c3b06f541f71300d2f..7e9bd7797f1a2364ab85416c279989ca2bd26d45 100644 (file)
--- a/src/cmd/8l/Makefile
+++ b/src/cmd/8l/Makefile
@@ -46,4 +46,4 @@ CLEANFILES+=enam.c
 
 
 %.$O: ../ld/%.c
-       $(HOST_CC) $(HOST_CFLAGS) -c -I. ../ld/$*.c
+       $(HOST_CC) $(HOST_CFLAGS) -I. ../ld/$*.c

diff --git a/src/lib9/Makefile b/src/lib9/Makefile
index 31f22c41e966b5d013c2ee25cdddd73d923204ef..bf1bf41a15ed436c30c45c00b3736769d75a2a13 100644 (file)
--- a/src/lib9/Makefile
+++ b/src/lib9/Makefile
@@ -111,12 +111,12 @@ include ../Make.clib
 GOROOT_FINAL?=$(GOROOT)
 
 %.$O: fmt/%.c
-       $(HOST_CC) -c $(HOST_CFLAGS) -DPLAN9PORT -Ifmt $<
+       $(HOST_CC) $(HOST_CFLAGS) -DPLAN9PORT -Ifmt $<
 
 %.$O: utf/%.c
-       $(HOST_CC) -c $(HOST_CFLAGS) $<
+       $(HOST_CC) $(HOST_CFLAGS) $<
 
 goos.$O: goos.c
        GOVERSION=`../version.bash` && \
-               $(HOST_CC) -c $(HOST_CFLAGS) -DGOOS='"$(GOOS)"' -DGOARCH='"$(GOARCH)"' -DGOROOT='"$(GOROOT_FINAL)"' -DGOVERSION='"'"$$GOVERSION"'"' $<
+               $(HOST_CC) $(HOST_CFLAGS) -DGOOS='"$(GOOS)"' -DGOARCH='"$(GOARCH)"' -DGOROOT='"$(GOROOT_FINAL)"' -DGOVERSION='"'"$$GOVERSION"'"' $<