gc, cc: avoid using the wrong library when building the compilers

This can happen on Plan 9 if we we're building
with the 32-bit and 64-bit host compilers, one
after the other.

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

diff --git a/.hgignore b/.hgignore
index 81c3d41560a1a99d7f1f42ca72b0ac5aa4fe3e26..488bc97fc8752ae5a94f2898119069dc3efa519c 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -3,7 +3,7 @@ syntax:glob
 .git
 .gitignore
 *.[568ao]
-*.ao
+*.a[568o]
 *.so
 *.pyc
 ._*

diff --git a/src/cmd/5c/Makefile b/src/cmd/5c/Makefile
index 60268e1c955c7ffb9c68d11ab67232812f1697b1..d2cddfa5221b4b70f8b6e792263877bc0de6fe7e 100644 (file)
--- a/src/cmd/5c/Makefile
+++ b/src/cmd/5c/Makefile
@@ -26,7 +26,7 @@ OFILES=\
        ../5l/enam.$O\
 
 LIB=\
-       ../cc/cc.a\
+       ../cc/cc.a$O\
 
 include ../../Make.ctool
 

diff --git a/src/cmd/5g/Makefile b/src/cmd/5g/Makefile
index 3c2a65fdf149559b30a6caed79b39080a7bb7aaa..647446246ba5c2add34db1e489992a23b041f367 100644 (file)
--- a/src/cmd/5g/Makefile
+++ b/src/cmd/5g/Makefile
@@ -28,7 +28,7 @@ OFILES=\
        reg.$O\
 
 LIB=\
-       ../gc/gc.a\
+       ../gc/gc.a$O\
 
 include ../../Make.ctool
 

diff --git a/src/cmd/6c/Makefile b/src/cmd/6c/Makefile
index e78b2b1aaa68b6122c04d93bba669da9ec1d9683..169a080d519edff07ba7bc8fad4e6d1a224f6fa3 100644 (file)
--- a/src/cmd/6c/Makefile
+++ b/src/cmd/6c/Makefile
@@ -28,7 +28,7 @@ OFILES=\
        ../6l/enam.$O\
 
 LIB=\
-       ../cc/cc.a\
+       ../cc/cc.a$O\
 
 include ../../Make.ctool
 

diff --git a/src/cmd/6g/Makefile b/src/cmd/6g/Makefile
index 870984a8c6662c00a634d019fa48dec85b9dcf9c..43e375174e6045e6ee98652c131f477873b3c37a 100644 (file)
--- a/src/cmd/6g/Makefile
+++ b/src/cmd/6g/Makefile
@@ -27,7 +27,7 @@ OFILES=\
        reg.$O\
 
 LIB=\
-       ../gc/gc.a\
+       ../gc/gc.a$O\
 
 include ../../Make.ctool
 

diff --git a/src/cmd/8c/Makefile b/src/cmd/8c/Makefile
index f078fbdf587cf55b1e84e0124603c0d17260197a..22ffedad8c599c135608636d431b3c093afcac0d 100644 (file)
--- a/src/cmd/8c/Makefile
+++ b/src/cmd/8c/Makefile
@@ -29,7 +29,7 @@ OFILES=\
        ../8l/enam.$O\
 
 LIB=\
-       ../cc/cc.a\
+       ../cc/cc.a$O\
 
 include ../../Make.ctool
 

diff --git a/src/cmd/8g/Makefile b/src/cmd/8g/Makefile
index 617cf1bb689f97869d39eb8c1a962b15832a796e..1422d07cc2cff49040cdc3fcc998d8398585776c 100644 (file)
--- a/src/cmd/8g/Makefile
+++ b/src/cmd/8g/Makefile
@@ -28,7 +28,7 @@ OFILES=\
        reg.$O\
 
 LIB=\
-       ../gc/gc.a\
+       ../gc/gc.a$O\
 
 include ../../Make.ctool
 

diff --git a/src/cmd/cc/Makefile b/src/cmd/cc/Makefile
index 8327d9516ffe7460198f59383cc6f2d109ca04cd..737af1f42da66c55f66e68a42063da11b364f0d7 100644 (file)
--- a/src/cmd/cc/Makefile
+++ b/src/cmd/cc/Makefile
@@ -5,7 +5,7 @@
 include ../../Make.inc
 O:=$(HOST_O)
 
-LIB=cc.a
+LIB=cc.a$O
 
 HFILES=\
        cc.h\

diff --git a/src/cmd/gc/Makefile b/src/cmd/gc/Makefile
index bb0d01637e930a8194b479fff3850eb4667c806e..060b086c6e6849a64a806a8acf7b38ab3e5560f2 100644 (file)
--- a/src/cmd/gc/Makefile
+++ b/src/cmd/gc/Makefile
@@ -5,7 +5,7 @@
 include ../../Make.inc
 O:=$(HOST_O)
 
-LIB=gc.a
+LIB=gc.a$O
 
 HFILES=\
        go.h\

diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index 9584bb74439f06221f1ef5e8ea1a25be3d0a98c1..7dc8e57e5093e2aa079188e8e9bf5ec0efaffb1f 100644 (file)
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -4,6 +4,8 @@
 
 #include       <bio.h>
 
+#pragma        lib     "../gc/gc.a$O"
+
 #undef OAPPEND
 
 // avoid <ctype.h>