3 files changed, 7 insertions, 7 deletions
diff --git a/src/cmd/gobuild/Makefile b/src/cmd/gobuild/Makefile
index 42c2a072b..8c0eb523b 100644
--- a/src/cmd/gobuild/Makefile
+++ b/src/cmd/gobuild/Makefile
@@ -5,7 +5,7 @@
 # sadly, not auto-generated
 
 O=6
-OS=568vq
+OS=568vqo
 GC=$(O)g
 CC=$(O)c -FVw
 AS=$(O)a
diff --git a/src/cmd/gobuild/gobuild.go b/src/cmd/gobuild/gobuild.go
index 7622494aa..9324e98ff 100644
--- a/src/cmd/gobuild/gobuild.go
+++ b/src/cmd/gobuild/gobuild.go
@@ -307,7 +307,7 @@ func Main() {
 
 	filenames := flag.Args();
 	if len(filenames) == 0 {
-		var err *os.Error;
+		var err os.Error;
 		filenames, err= SourceFiles(".");
 		if err != nil {
 			fatal("reading .: ", err.String());
@@ -317,7 +317,7 @@ func Main() {
 	state := ScanFiles(filenames);
 	state.Build();
 	if *writeMakefile {
-		t, err, line := template.Parse(makefileTemplate, makefileMap);
+		t, err := template.Parse(makefileTemplate, makefileMap);
 		if err != nil {
 			fatal("template.Parse: ", err.String());
 		}
diff --git a/src/cmd/gobuild/util.go b/src/cmd/gobuild/util.go
index 8f69f39b4..34351cea8 100644
--- a/src/cmd/gobuild/util.go
+++ b/src/cmd/gobuild/util.go
@@ -38,7 +38,7 @@ func fatal(args ...) {
 }
 
 func init() {
-	var err *os.Error;
+	var err os.Error;
 	goarch, err = os.Getenv("GOARCH");
 	goos, err = os.Getenv("GOOS");
 
@@ -183,7 +183,7 @@ func (s MakeString) String() string {
 var ParseError = os.NewError("parse errors");
 
 // TODO(rsc): Should this be in the AST library?
-func LitString(p []*ast.StringLit) (string, *os.Error) {
+func LitString(p []*ast.StringLit) (string, os.Error) {
 	s := "";
 	for i, lit := range p {
 		t, err := strconv.Unquote(string(lit.Value));
@@ -195,7 +195,7 @@ func LitString(p []*ast.StringLit) (string, *os.Error) {
 	return s, nil;
 }
 
-func PackageImports(file string) (pkg string, imports []string, err1 *os.Error) {
+func PackageImports(file string) (pkg string, imports []string, err1 os.Error) {
 	f, err := os.Open(file, os.O_RDONLY, 0);
 	if err != nil {
 		return "", nil, err
@@ -224,7 +224,7 @@ func PackageImports(file string) (pkg string, imports []string, err1 *os.Error)
 	return prog.Name.Value, imp, nil;
 }
 
-func SourceFiles(dir string) ([]string, *os.Error) {
+func SourceFiles(dir string) ([]string, os.Error) {
 	f, err := os.Open(dir, os.O_RDONLY, 0);
 	if err != nil {
 		return nil, err;