diff options
Diffstat (limited to 'meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch')
-rw-r--r-- | meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch b/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch index 597a4e2104..cc45496e9c 100644 --- a/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch +++ b/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch | |||
@@ -17,10 +17,10 @@ Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> | |||
17 | 1 file changed, 13 insertions(+), 2 deletions(-) | 17 | 1 file changed, 13 insertions(+), 2 deletions(-) |
18 | 18 | ||
19 | diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go | 19 | diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go |
20 | index c0e6265..b199fee 100644 | 20 | index 1549800afb..f41fb2c4ef 100644 |
21 | --- a/src/cmd/go/internal/load/pkg.go | 21 | --- a/src/cmd/go/internal/load/pkg.go |
22 | +++ b/src/cmd/go/internal/load/pkg.go | 22 | +++ b/src/cmd/go/internal/load/pkg.go |
23 | @@ -2269,6 +2269,17 @@ func appendBuildSetting(info *debug.BuildInfo, key, value string) { | 23 | @@ -2277,6 +2277,17 @@ func appendBuildSetting(info *debug.BuildInfo, key, value string) { |
24 | info.Settings = append(info.Settings, debug.BuildSetting{Key: key, Value: value}) | 24 | info.Settings = append(info.Settings, debug.BuildSetting{Key: key, Value: value}) |
25 | } | 25 | } |
26 | 26 | ||
@@ -38,7 +38,7 @@ index c0e6265..b199fee 100644 | |||
38 | // setBuildInfo gathers build information and sets it into | 38 | // setBuildInfo gathers build information and sets it into |
39 | // p.Internal.BuildInfo, which will later be formatted as a string and embedded | 39 | // p.Internal.BuildInfo, which will later be formatted as a string and embedded |
40 | // in the binary. setBuildInfo should only be called on a main package with no | 40 | // in the binary. setBuildInfo should only be called on a main package with no |
41 | @@ -2376,7 +2387,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) { | 41 | @@ -2384,7 +2395,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) { |
42 | if gcflags := BuildGcflags.String(); gcflags != "" && cfg.BuildContext.Compiler == "gc" { | 42 | if gcflags := BuildGcflags.String(); gcflags != "" && cfg.BuildContext.Compiler == "gc" { |
43 | appendSetting("-gcflags", gcflags) | 43 | appendSetting("-gcflags", gcflags) |
44 | } | 44 | } |
@@ -47,7 +47,7 @@ index c0e6265..b199fee 100644 | |||
47 | // https://go.dev/issue/52372: only include ldflags if -trimpath is not set, | 47 | // https://go.dev/issue/52372: only include ldflags if -trimpath is not set, |
48 | // since it can include system paths through various linker flags (notably | 48 | // since it can include system paths through various linker flags (notably |
49 | // -extar, -extld, and -extldflags). | 49 | // -extar, -extld, and -extldflags). |
50 | @@ -2419,7 +2430,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) { | 50 | @@ -2427,7 +2438,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) { |
51 | // subset of flags that are known not to be paths? | 51 | // subset of flags that are known not to be paths? |
52 | if cfg.BuildContext.CgoEnabled && !cfg.BuildTrimpath { | 52 | if cfg.BuildContext.CgoEnabled && !cfg.BuildTrimpath { |
53 | for _, name := range []string{"CGO_CFLAGS", "CGO_CPPFLAGS", "CGO_CXXFLAGS", "CGO_LDFLAGS"} { | 53 | for _, name := range []string{"CGO_CFLAGS", "CGO_CPPFLAGS", "CGO_CXXFLAGS", "CGO_LDFLAGS"} { |
@@ -57,5 +57,5 @@ index c0e6265..b199fee 100644 | |||
57 | } | 57 | } |
58 | appendSetting("GOARCH", cfg.BuildContext.GOARCH) | 58 | appendSetting("GOARCH", cfg.BuildContext.GOARCH) |
59 | -- | 59 | -- |
60 | 2.43.0 | 60 | 2.44.0 |
61 | 61 | ||