Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tinygo: -compiler command line argument (e.g. tinygo) #121

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

tinygo: -compiler command line argument (e.g. tinygo) #121

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b37fc01
-compiler command line argument (e.g. tinygo)
archie2x Aug 6, 2024
ee82c9a
add golang.WithCompiler() to set compiler on existing env
archie2x Aug 6, 2024
81f0c36
Address CRs
archie2x Sep 16, 2024
be6e468
More CR.
archie2x Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/cmd/makebb/makebb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@
l.Printf("Disabling CGO for u-root...")
env.CgoEnabled = false
}

err = env.CompilerInit()
if err != nil {
l.Fatal(err)

Check warning on line 49 in src/cmd/makebb/makebb.go

View check run for this annotation

Codecov / codecov/patch

src/cmd/makebb/makebb.go#L49 

Added line #L49 was not covered by tests
}

l.Printf("Build environment: %s", env)
l.Printf("Compiler: %s", env.Compiler.VersionOutput)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks weird, probably one of my suggestions fits better?

Suggested change
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)

Or

Suggested change
l.Printf("Build environment: %s", env)
l.Printf("Compiler: %s", env.Compiler.VersionOutput)
l.Printf("Build environment: %s Compiler: %s\n", env, env.Compiler.VersionOutput)


tmpDir := *genDir
remove := false
Expand Down
89 changes: 11 additions & 78 deletions src/pkg/golang/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"flag"
"fmt"
"go/build"
"log"
"os"
"os/exec"
"path/filepath"
"strconv"
"strings"
Expand All @@ -36,6 +34,8 @@
GO111MODULE string
Mod ModBehavior
GBBDEBUG bool

Compiler Compiler
}

// Copy makes a copy of Environ with the given changes.
Expand All @@ -45,6 +45,7 @@
GO111MODULE: c.GO111MODULE,
Mod: c.Mod,
GBBDEBUG: c.GBBDEBUG,
Compiler: c.Compiler,
}
e.Apply(opts...)
return e
Expand All @@ -54,6 +55,8 @@
func (c *Environ) RegisterFlags(f *flag.FlagSet) {
f.Var((*uflag.Strings)(&c.BuildTags), "go-build-tags", "Go build tags")
f.StringVar((*string)(&c.Mod), "go-mod", string(c.Mod), "Value of -mod to go commands (allowed: (empty), vendor, mod, readonly)")
f.StringVar((*string)(&c.Compiler.Path), "compiler", "",
"override go compiler used (e.g. \"/path/to/tinygo\")")
}

// Valid returns an error if GOARCH, GOROOT, or GOOS are unset.
Expand Down Expand Up @@ -176,6 +179,12 @@

// Lookup looks up packages by patterns relative to dir, using the Go environment from c.
func (c *Environ) Lookup(mode packages.LoadMode, patterns ...string) ([]*packages.Package, error) {

// required to compute compiler build tags
if err := c.CompilerInit(); err != nil {
return nil, err

Check warning on line 185 in src/pkg/golang/build.go

View check run for this annotation

Codecov / codecov/patch

src/pkg/golang/build.go#L185 

Added line #L185 was not covered by tests
}

cfg := &packages.Config{
Mode: mode,
Env: append(os.Environ(), c.Env()...),
Expand All @@ -191,34 +200,6 @@
return packages.Load(cfg, patterns...)
}

// GoCmd runs a go command in the environment.
func (c Environ) GoCmd(gocmd string, args ...string) *exec.Cmd {
goBin := filepath.Join(c.GOROOT, "bin", "go")
args = append([]string{gocmd}, args...)
cmd := exec.Command(goBin, args...)
if c.GBBDEBUG {
log.Printf("GBB Go invocation: %s %s %#v", c, goBin, args)
}
cmd.Dir = c.Dir
cmd.Env = append(os.Environ(), c.Env()...)
return cmd
}

// Version returns the Go version string that runtime.Version would return for
// the Go compiler in this environ.
func (c Environ) Version() (string, error) {
cmd := c.GoCmd("version")
v, err := cmd.CombinedOutput()
if err != nil {
return "", err
}
s := strings.Fields(string(v))
if len(s) < 3 {
return "", fmt.Errorf("unknown go version, tool returned weird output for 'go version': %v", string(v))
}
return s[2], nil
}

func (c Environ) envCommon() []string {
var env []string
if c.GOARCH != "" {
Expand Down Expand Up @@ -300,54 +281,6 @@
f.Var((*uflag.Strings)(&b.ExtraArgs), "go-extra-args", "Extra args to 'go build'")
}

func (c Environ) build(dirPath string, binaryPath string, pattern []string, opts *BuildOpts) error {
args := []string{
// Force rebuilding of packages.
"-a",

"-o", binaryPath,
}
if c.GO111MODULE != "off" && len(c.Mod) > 0 {
args = append(args, "-mod", string(c.Mod))
}
if c.InstallSuffix != "" {
args = append(args, "-installsuffix", c.Context.InstallSuffix)
}
if opts == nil || !opts.EnableInlining {
// Disable "function inlining" to get a (likely) smaller binary.
args = append(args, "-gcflags=all=-l")
}
if opts == nil || !opts.NoStrip {
// Strip all symbols, and don't embed a Go build ID to be reproducible.
args = append(args, "-ldflags", "-s -w -buildid=")
}
if opts == nil || !opts.NoTrimPath {
// Reproducible builds: Trim any GOPATHs out of the executable's
// debugging information.
//
// E.g. Trim /tmp/bb-*/ from /tmp/bb-12345567/src/github.com/...
args = append(args, "-trimpath")
}
if opts != nil {
args = append(args, opts.ExtraArgs...)
}

if len(c.BuildTags) > 0 {
args = append(args, []string{"-tags", strings.Join(c.BuildTags, " ")}...)
}
args = append(args, pattern...)

cmd := c.GoCmd("build", args...)
if dirPath != "" {
cmd.Dir = dirPath
}

if o, err := cmd.CombinedOutput(); err != nil {
return fmt.Errorf("error building go package in %q: %v, %v", dirPath, string(o), err)
}
return nil
}

// BuildDir compiles the package in the directory `dirPath`, writing the build
// object to `binaryPath`.
func (c Environ) BuildDir(dirPath string, binaryPath string, opts *BuildOpts) error {
Expand Down
Loading
Loading