Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 1 | From 10766ca6f4007b96e3f6bf4fb496e5df74397eb9 Mon Sep 17 00:00:00 2001 |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 28 Mar 2022 10:59:03 -0700 |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 4 | Subject: [PATCH 1/9] cmd/go: make content-based hash generation less pedantic |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 5 | |
| 6 | Go 1.10's build tool now uses content-based hashes to |
| 7 | determine when something should be built or re-built. |
| 8 | This same mechanism is used to maintain a built-artifact |
| 9 | cache for speeding up builds. |
| 10 | |
| 11 | However, the hashes it generates include information that |
| 12 | doesn't work well with OE, nor with using a shared runtime |
| 13 | library. |
| 14 | |
| 15 | First, it embeds path names to source files, unless |
| 16 | building within GOROOT. This prevents the building |
| 17 | of a package in GOPATH for later staging into GOROOT. |
| 18 | |
| 19 | This patch adds support for the environment variable |
| 20 | GOPATH_OMIT_IN_ACTIONID. If present, path name |
| 21 | embedding is disabled. |
| 22 | |
| 23 | Upstream-Status: Inappropriate [OE specific] |
| 24 | |
| 25 | Signed-off-by: Alex Kube <alexander.j.kube@gmail.com> |
| 26 | Signed-off-by: Matt Madison <matt@madison.systems> |
| 27 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 28 | --- |
| 29 | src/cmd/go/internal/envcmd/env.go | 2 +- |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 30 | src/cmd/go/internal/work/exec.go | 44 ++++++++++++++++++++++++------- |
| 31 | 2 files changed, 36 insertions(+), 10 deletions(-) |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 32 | |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 33 | diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 34 | index 66ef5ce..fb7448a 100644 |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 35 | --- a/src/cmd/go/internal/envcmd/env.go |
| 36 | +++ b/src/cmd/go/internal/envcmd/env.go |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 37 | @@ -183,7 +183,7 @@ func ExtraEnvVarsCostly() []cfg.EnvVar { |
| 38 | } |
| 39 | }() |
Patrick Williams | 2390b1b | 2022-11-03 13:47:49 -0500 | [diff] [blame] | 40 | |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 41 | - cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}) |
| 42 | + cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false) |
| 43 | if err != nil { |
| 44 | // Should not happen - b.CFlags was given an empty package. |
| 45 | fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 46 | diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 47 | index d6fa847..7e4fcb3 100644 |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 48 | --- a/src/cmd/go/internal/work/exec.go |
| 49 | +++ b/src/cmd/go/internal/work/exec.go |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 50 | @@ -223,6 +223,8 @@ func (b *Builder) Do(ctx context.Context, root *Action) { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 51 | writeActionGraph() |
| 52 | } |
| 53 | |
| 54 | +var omitGopath = os.Getenv("GOPATH_OMIT_IN_ACTIONID") != "" |
| 55 | + |
| 56 | // buildActionID computes the action ID for a build action. |
| 57 | func (b *Builder) buildActionID(a *Action) cache.ActionID { |
| 58 | p := a.Package |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 59 | @@ -244,7 +246,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 60 | if p.Module != nil { |
| 61 | fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) |
| 62 | } |
| 63 | - } else if p.Goroot { |
| 64 | + } else if p.Goroot || omitGopath { |
| 65 | // The Go compiler always hides the exact value of $GOROOT |
| 66 | // when building things in GOROOT. |
| 67 | // |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 68 | @@ -276,9 +278,9 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 69 | } |
| 70 | if len(p.CgoFiles)+len(p.SwigFiles)+len(p.SwigCXXFiles) > 0 { |
| 71 | fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) |
| 72 | - cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p) |
| 73 | + cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p, true) |
| 74 | |
| 75 | - ccExe := b.ccExe() |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 76 | + ccExe := filterCompilerFlags(b.ccExe(), true) |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 77 | fmt.Fprintf(h, "CC=%q %q %q %q\n", ccExe, cppflags, cflags, ldflags) |
| 78 | // Include the C compiler tool ID so that if the C |
| 79 | // compiler changes we rebuild the package. |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 80 | @@ -286,14 +288,14 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { |
| 81 | fmt.Fprintf(h, "CC ID=%q\n", ccID) |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 82 | } |
| 83 | if len(p.CXXFiles)+len(p.SwigCXXFiles) > 0 { |
| 84 | - cxxExe := b.cxxExe() |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 85 | + cxxExe := filterCompilerFlags(b.cxxExe(), true) |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 86 | fmt.Fprintf(h, "CXX=%q %q\n", cxxExe, cxxflags) |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 87 | if cxxID, _, err := b.gccToolID(cxxExe[0], "c++"); err == nil { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 88 | fmt.Fprintf(h, "CXX ID=%q\n", cxxID) |
| 89 | } |
| 90 | } |
| 91 | if len(p.FFiles) > 0 { |
| 92 | - fcExe := b.fcExe() |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 93 | + fcExe := filterCompilerFlags(b.fcExe(), true) |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 94 | fmt.Fprintf(h, "FC=%q %q\n", fcExe, fflags) |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 95 | if fcID, _, err := b.gccToolID(fcExe[0], "f95"); err == nil { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 96 | fmt.Fprintf(h, "FC ID=%q\n", fcID) |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 97 | @@ -310,7 +312,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 98 | } |
| 99 | } |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 100 | if p.Internal.BuildInfo != "" { |
| 101 | - fmt.Fprintf(h, "modinfo %q\n", p.Internal.BuildInfo) |
| 102 | + //fmt.Fprintf(h, "modinfo %q\n", p.Internal.BuildInfo) |
| 103 | } |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 104 | |
| 105 | // Configuration specific to compiler toolchain. |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 106 | @@ -2970,8 +2972,25 @@ func envList(key, def string) []string { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 107 | return args |
| 108 | } |
| 109 | |
| 110 | +var filterFlags = os.Getenv("CGO_PEDANTIC") == "" |
| 111 | + |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 112 | +func filterCompilerFlags(flags []string, keepfirst bool) []string { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 113 | + var newflags []string |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 114 | + var realkeepfirst bool = keepfirst |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 115 | + if !filterFlags { |
| 116 | + return flags |
| 117 | + } |
| 118 | + for _, flag := range flags { |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 119 | + if strings.HasPrefix(flag, "-m") || realkeepfirst { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 120 | + newflags = append(newflags, flag) |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 121 | + realkeepfirst = false |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 122 | + } |
| 123 | + } |
| 124 | + return newflags |
| 125 | +} |
| 126 | + |
| 127 | // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. |
| 128 | -func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) { |
| 129 | +func (b *Builder) CFlags(p *load.Package, filtered bool) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 130 | if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 131 | return |
| 132 | } |
| 133 | @@ -2987,6 +3006,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l |
| 134 | if ldflags, err = buildFlags("LDFLAGS", defaultCFlags, p.CgoLDFLAGS, checkLinkerFlags); err != nil { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 135 | return |
| 136 | } |
| 137 | + if filtered { |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 138 | + cppflags = filterCompilerFlags(cppflags, false) |
| 139 | + cflags = filterCompilerFlags(cflags, false) |
| 140 | + cxxflags = filterCompilerFlags(cxxflags, false) |
| 141 | + fflags = filterCompilerFlags(fflags, false) |
| 142 | + ldflags = filterCompilerFlags(ldflags, false) |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 143 | + } |
| 144 | |
| 145 | return |
| 146 | } |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 147 | @@ -3002,7 +3028,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 148 | |
| 149 | func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { |
| 150 | p := a.Package |
| 151 | - cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, cgoFFLAGS, cgoLDFLAGS, err := b.CFlags(p) |
| 152 | + cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, cgoFFLAGS, cgoLDFLAGS, err := b.CFlags(p, false) |
| 153 | if err != nil { |
| 154 | return nil, nil, err |
| 155 | } |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 156 | @@ -3510,7 +3536,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { |
Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 157 | |
| 158 | // Run SWIG on one SWIG input file. |
| 159 | func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { |
| 160 | - cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, _, _, err := b.CFlags(p) |
| 161 | + cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, _, _, err := b.CFlags(p, false) |
| 162 | if err != nil { |
| 163 | return "", "", err |
| 164 | } |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 165 | -- |
| 166 | 2.30.2 |
| 167 | |