Patchwork [libgo] Fix typos in Makefile.am

login
register
mail settings
Submitter Rainer Orth
Date Jan. 14, 2011, 4:16 p.m.
Message ID <yddfwsvpik1.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/78949/
State New
Headers show

Comments

Rainer Orth - Jan. 14, 2011, 4:16 p.m.
Bootstrapping with Go on Solaris 11/x86 and SPARC failed building libgo
due to two typos in Makefile.am.

I'd normally install the following patch as obvious, but I'm not
completely sure what the rules for libgo are wrt. synchronization with
upstream.

Ok for mainline?

	Rainer


2011-01-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* Makefile.am [LIBGO_IS_SOLARIS] (syscall_filesize_file): Fix typos.
	* Makefile.in: Regenerate.
Ian Taylor - Jan. 14, 2011, 6:50 p.m.
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:

> I'd normally install the following patch as obvious, but I'm not
> completely sure what the rules for libgo are wrt. synchronization with
> upstream.

Right, please try to avoid making changes to libgo and gcc/go/gofrontend
in trunk.  Those directories are copied from the upstream directories.
(It's not fatal if you do make a change, just inconvenient.)

The easiest way for me for you to propose a patch to those directories
is to follow the procedure described at
http://golang.org/doc/gccgo_contribute.html which refers to
http://golang.org/doc/contribute.html .  That lets me patch your change
directly into the master sources and lets me use a nice web based
commenting tool.  But you don't have to follow that procedure, and the
usual gcc-patches approaches is fine.


> 2011-01-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
>
> 	* Makefile.am [LIBGO_IS_SOLARIS] (syscall_filesize_file): Fix typos.
> 	* Makefile.in: Regenerate.

Committed.

Thanks.

Ian

Patch

diff -r 6c184227ca86 libgo/Makefile.am
--- a/libgo/Makefile.am	Fri Jan 14 10:25:46 2011 +0100
+++ b/libgo/Makefile.am	Fri Jan 14 17:13:20 2011 +0100
@@ -1,6 +1,6 @@ 
 # Makefile.am -- Go library Makefile.
 
-# Copyright 2009, 2010 The Go Authors. All rights reserved.
+# Copyright 2009, 2010, 2011 The Go Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
@@ -1041,10 +1041,10 @@ 
 if LIBGO_IS_SOLARIS
 if LIBGO_IS_386
 # Use lseek64 on 386 Solaris.
-syscall_filesize_flie = syscalls/sysfile_largefile.go
+syscall_filesize_file = syscalls/sysfile_largefile.go
 else # !LIBGO_IS_LINUX && LIBGO_IS_SOLARIS && !LIBGO_IS_386
 # Use lseek on amd64 Solaris.
-syscall_filesize_flie = syscalls/sysfile_regfile.go
+syscall_filesize_file = syscalls/sysfile_regfile.go
 endif # !LIBGO_IS_386
 else # !LIBGO_IS_LINUX && !LIBGO_IS_SOLARIS
 # Use lseek by default.