More CR

Signed-off-by: Roger Standridge <[email protected]>

src/cmd/makebb/makebb.go

@@ -49,8 +49,8 @@ func main() {
 		l.Fatal(err)
 	}
 
-	l.Printf("Build environment: %s", env)
-	l.Printf("Compiler: %s", env.Compiler.VersionOutput)
+	l.Printf("Build environment: %s\n", env)
+	l.Printf("Compiler: %s\n", env.Compiler.VersionOutput)
 
 	tmpDir := *genDir
 	remove := false

src/pkg/golang/compiler.go

@@ -70,8 +70,7 @@ func (c Environ) compilerCmd(gocmd string, args ...string) *exec.Cmd {
 	return cmd
 }
 
-// if go-compiler specified, resolve absolute-path from PATH,
-// otherwise return 'nil'.
+// if go-compiler specified, return its absolute-path, otherwise return 'nil'
 func (c *Environ) compilerAbs() error {
 	if c.Compiler.Path != "" {
 		fname, err := exec.LookPath(string(c.Compiler.Path))
@@ -86,29 +85,29 @@ func (c *Environ) compilerAbs() error {
 	return nil
 }
 
-// runs compilerCmd("version") and parse/caches output, to environ.Compiler
+// runs compilerCmd("version") and parse/caches output to environ.Compiler
 func (c *Environ) CompilerInit() error {
-
 	if c.Compiler.IsInit {
 		return nil
 	}
 
 	c.compilerAbs()
 
 	cmd := c.compilerCmd("version")
-	v, err := cmd.CombinedOutput()
+	vb, err := cmd.CombinedOutput()
 	if err != nil {
 		return err
 	}
+	v := string(vb)
 
 	efmt := "go-compiler 'version' output unrecognized: %v"
-	s := strings.Fields(string(v))
+	s := strings.Fields(v)
 	if len(s) < 1 {
-		return fmt.Errorf(efmt, string(v))
+		return fmt.Errorf(efmt, v)
 	}
 
 	compiler := c.Compiler
-	compiler.VersionOutput = string(v)
+	compiler.VersionOutput = strings.TrimSpace(v)
 	compiler.Identifier = s[0]
 	compiler.Type = CompilerTypeFromString(compiler.Identifier)
 	compiler.IsInit = true
@@ -117,15 +116,15 @@ func (c *Environ) CompilerInit() error {
 
 	case CompilerGo:
 		if len(s) < 3 {
-			return fmt.Errorf(efmt, string(v))
+			return fmt.Errorf(efmt, v)
 		}
 		compiler.Version = s[2]
 		compiler.VersionGo = s[2]
 
 	case CompilerTinygo:
 		// e.g. "tinygo version 0.33.0 darwin/arm64 (using go version go1.22.2 and LLVM version 18.1.2)"
 		if len(s) < 8 {
-			return fmt.Errorf(efmt, string(v))
+			return fmt.Errorf(efmt, v)
 		}
 		compiler.Version = s[2]
 		compiler.VersionGo = s[7]
@@ -156,14 +155,14 @@ func (c *Environ) CompilerInit() error {
 		}
 
 	case CompilerUnkown:
-		return fmt.Errorf(efmt, string(v))
+		return fmt.Errorf(efmt, v)
 	}
 	c.Compiler = compiler
 	return nil
 }
 
-// Version returns the Go version string that runtime.Version would return for
-// the Go compiler in this environ.
+// returns the Go version string that runtime.Version would return for the Go
+// compiler in this environ.
 func (c *Environ) Version() (string, error) {
 	if err := c.CompilerInit(); err != nil {
 		return "", err
@@ -172,7 +171,6 @@ func (c *Environ) Version() (string, error) {
 }
 
 func (c Environ) build(dirPath string, binaryPath string, pattern []string, opts *BuildOpts) error {
-
 	if err := c.CompilerInit(); err != nil {
 		return err
 	}