mirror of
https://github.com/golang/go
synced 2024-11-13 16:00:21 -07:00
go/build: silence all warnings
R=rsc CC=golang-dev https://golang.org/cl/5529055
This commit is contained in:
parent
6e1c0df104
commit
191873981a
@ -7,7 +7,6 @@ package build
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
@ -81,7 +80,6 @@ func (t *Tree) HasPkg(pkg string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return !fi.IsDir()
|
return !fi.IsDir()
|
||||||
// TODO(adg): check object version is consistent
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -150,38 +148,20 @@ var (
|
|||||||
func init() {
|
func init() {
|
||||||
root := runtime.GOROOT()
|
root := runtime.GOROOT()
|
||||||
t, err := newTree(root)
|
t, err := newTree(root)
|
||||||
if err != nil {
|
if err == nil {
|
||||||
log.Printf("invalid GOROOT %q: %v", root, err)
|
|
||||||
} else {
|
|
||||||
t.Goroot = true
|
t.Goroot = true
|
||||||
Path = []*Tree{t}
|
Path = []*Tree{t}
|
||||||
}
|
}
|
||||||
|
|
||||||
Loop:
|
|
||||||
for _, p := range filepath.SplitList(os.Getenv("GOPATH")) {
|
for _, p := range filepath.SplitList(os.Getenv("GOPATH")) {
|
||||||
if p == "" {
|
if p == "" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
t, err := newTree(p)
|
t, err := newTree(p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("invalid GOPATH %q: %v", p, err)
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for dupes.
|
|
||||||
// TODO(alexbrainman): make this correct under windows (case insensitive).
|
|
||||||
for _, t2 := range Path {
|
|
||||||
if t2.Path != t.Path {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if t2.Goroot {
|
|
||||||
log.Printf("GOPATH is the same as GOROOT: %q", t.Path)
|
|
||||||
} else {
|
|
||||||
log.Printf("duplicate GOPATH entry: %q", t.Path)
|
|
||||||
}
|
|
||||||
continue Loop
|
|
||||||
}
|
|
||||||
|
|
||||||
Path = append(Path, t)
|
Path = append(Path, t)
|
||||||
gcImportArgs = append(gcImportArgs, "-I", t.PkgDir())
|
gcImportArgs = append(gcImportArgs, "-I", t.PkgDir())
|
||||||
ldImportArgs = append(ldImportArgs, "-L", t.PkgDir())
|
ldImportArgs = append(ldImportArgs, "-L", t.PkgDir())
|
||||||
|
Loading…
Reference in New Issue
Block a user