Skip to content

Commit

Permalink
cmd/cgo, go/build: finish a cleanup TODO
Browse files Browse the repository at this point in the history
Removing #cgo directive parsing from cmd/cgo was done in
https://golang.org/cl/8610044.

Change-Id: Id1bec58c6ec1f932df0ce0ee84ff253655bb73ff
Reviewed-on: https://go-review.googlesource.com/2501
Reviewed-by: Ian Lance Taylor <[email protected]>
  • Loading branch information
mdempsky authored and ianlancetaylor committed Jan 8, 2015
1 parent 5832933 commit ee94cd1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
14 changes: 0 additions & 14 deletions src/cmd/cgo/gcc.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,20 +154,6 @@ func splitQuoted(s string) (r []string, err error) {
return args, err
}

var safeBytes = []byte(`+-.,/0123456789:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\_abcdefghijklmnopqrstuvwxyz`)

func safeName(s string) bool {
if s == "" {
return false
}
for i := 0; i < len(s); i++ {
if c := s[i]; c < 0x80 && bytes.IndexByte(safeBytes, c) < 0 {
return false
}
}
return true
}

// Translate rewrites f.AST, the original Go input, to remove
// references to the imported package C, replacing them with
// references to the equivalent Go types, functions, and variables.
Expand Down
3 changes: 0 additions & 3 deletions src/go/build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -1073,9 +1073,6 @@ func (ctxt *Context) shouldBuild(content []byte, allTags map[string]bool) bool {
// saveCgo saves the information from the #cgo lines in the import "C" comment.
// These lines set CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS and pkg-config directives
// that affect the way cgo's C code is built.
//
// TODO(rsc): This duplicates code in cgo.
// Once the dust settles, remove this code from cgo.
func (ctxt *Context) saveCgo(filename string, di *Package, cg *ast.CommentGroup) error {
text := cg.Text()
for _, line := range strings.Split(text, "\n") {
Expand Down

0 comments on commit ee94cd1

Please sign in to comment.