diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-03-07 16:10:56 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-09 14:43:11 +0000 |
commit | 66d57c6ed49669c9012d9ea831b5783b3168bb7f (patch) | |
tree | 9cccb8cc72f39b70fb41538907f0deb6e05b7726 /meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch | |
parent | e53aa46f435d68706d042af17bf629a16f18556c (diff) | |
download | poky-66d57c6ed49669c9012d9ea831b5783b3168bb7f.tar.gz |
go-1.9: Drop the recipes
We now have 1.11 and 1.12
(From OE-Core rev: 277162917331b235863eec31cbe82c101f0e4efe)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch')
-rw-r--r-- | meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch deleted file mode 100644 index 83fd78c3d7..0000000000 --- a/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 21d83dd9499e5be30eea28dd7034d1ea2a01c838 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt Madison <matt@madison.systems> | ||
3 | Date: Tue, 14 Nov 2017 07:38:42 -0800 | ||
4 | Subject: [PATCH 10/10] make.bash: override CC when building dist and | ||
5 | go_bootstrap | ||
6 | |||
7 | For cross-canadian builds, dist and go_bootstrap | ||
8 | run on the build host, so CC needs to point to the | ||
9 | build host's C compiler. Add a BUILD_CC environment | ||
10 | for this, falling back to $CC if not present. | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Matt Madison <matt@madison.systems> | ||
15 | --- | ||
16 | src/make.bash | 4 ++-- | ||
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/src/make.bash b/src/make.bash | ||
20 | index 0bdadc6..f199349 100755 | ||
21 | --- a/src/make.bash | ||
22 | +++ b/src/make.bash | ||
23 | @@ -131,7 +131,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then | ||
24 | exit 1 | ||
25 | fi | ||
26 | rm -f cmd/dist/dist | ||
27 | -GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist | ||
28 | +CC=${BUILD_CC:-${CC}} GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist | ||
29 | |||
30 | # -e doesn't propagate out of eval, so check success by hand. | ||
31 | eval $(./cmd/dist/dist env -p || echo FAIL=true) | ||
32 | @@ -167,7 +167,7 @@ elif [ "$1" = "--host-only" ]; then | ||
33 | fi | ||
34 | |||
35 | if [ "$do_host_build" = "yes" ]; then | ||
36 | - ./cmd/dist/dist bootstrap $buildall $GO_DISTFLAGS -v # builds go_bootstrap | ||
37 | + CC=${BUILD_CC:-${CC}} ./cmd/dist/dist bootstrap $buildall $GO_DISTFLAGS -v # builds go_bootstrap | ||
38 | # Delay move of dist tool to now, because bootstrap may clear tool directory. | ||
39 | mv cmd/dist/dist "$GOTOOLDIR"/dist | ||
40 | echo | ||
41 | -- | ||
42 | 2.7.4 | ||
43 | |||