putting changes back

Author: grantnelson-wf

build/build.go

@@ -1018,7 +1018,7 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 
 	importContext := &compiler.ImportContext{
 		Packages: s.Types,
-		Import:   s.ImportResolverFor(pkg),
+		Import:   s.ImportResolverFor(pkg.Dir),
 	}
 	archive, err := compiler.Compile(pkg.ImportPath, files, fileSet, importContext, s.options.Minify)
 	if err != nil {
@@ -1043,12 +1043,12 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 
 // ImportResolverFor returns a function which returns a compiled package archive
 // given an import path.
-func (s *Session) ImportResolverFor(pkg *PackageData) func(string) (*compiler.Archive, error) {
+func (s *Session) ImportResolverFor(srcDir string) func(string) (*compiler.Archive, error) {
 	return func(path string) (*compiler.Archive, error) {
 		if archive, ok := s.UpToDateArchives[path]; ok {
 			return archive, nil
 		}
-		_, archive, err := s.buildImportPathWithSrcDir(path, pkg.Dir)
+		_, archive, err := s.buildImportPathWithSrcDir(path, srcDir)
 		return archive, err
 	}
 }
@@ -1087,13 +1087,7 @@ func (s *Session) WriteCommandPackage(archive *compiler.Archive, pkgObj string)
 		sourceMapFilter.MappingCallback = s.SourceMappingCallback(m)
 	}
 
-	deps, err := compiler.ImportDependencies(archive, func(path string) (*compiler.Archive, error) {
-		if archive, ok := s.UpToDateArchives[path]; ok {
-			return archive, nil
-		}
-		_, archive, err := s.buildImportPathWithSrcDir(path, "")
-		return archive, err
-	})
+	deps, err := compiler.ImportDependencies(archive, s.ImportResolverFor(""))
 	if err != nil {
 		return err
 	}

tool.go

@@ -389,7 +389,7 @@ func main() {
 			}
 			importContext := &compiler.ImportContext{
 				Packages: s.Types,
-				Import:   s.ImportResolverFor(mainPkg),
+				Import:   s.ImportResolverFor(mainPkg.Dir),
 			}
 			mainPkgArchive, err := compiler.Compile(mainPkg.ImportPath, []*ast.File{mainFile}, fset, importContext, options.Minify)
 			if err != nil {