code review 7237049: go/build: clean up after rollback

src/pkg/go/build/build.go

 // Copyright 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.
 
 package build
 
 import (
         "bytes"
         "errors"
         "fmt"
@@ skipping 303 matching lines @@
 // IsCommand reports whether the package is considered a
 // command to be installed (not just a library).
 // Packages named "main" are treated as commands.
 func (p *Package) IsCommand() bool {
         return p.Name == "main"
 }
 
 // ImportDir is like Import but processes the Go package found in
 // the named directory.
 func (ctxt *Context) ImportDir(dir string, mode ImportMode) (*Package, error) {
-        p, err := ctxt.Import(".", dir, mode)
-        // TODO(rsc,adg): breaks godoc net/http. Not sure why.
-        // See CL 7232047 and issue 4696.
-        if false && err == nil && !ctxt.isDir(p.Dir) {
-                err = fmt.Errorf("%q is not a directory", p.Dir)
-        }
-        return p, err
+        return ctxt.Import(".", dir, mode)
 }
 
 // NoGoError is the error used by Import to describe a directory
 // containing no Go source files.
 type NoGoError struct {
         Dir string
 }
 
 func (e *NoGoError) Error() string {
         return "no Go source files in " + e.Dir
@@ skipping 699 matching lines @@
         switch goarch {
         case "386":
                 return "8", nil
         case "amd64":
                 return "6", nil
         case "arm":
                 return "5", nil
         }
         return "", errors.New("unsupported GOARCH " + goarch)
 }