summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch4
-rw-r--r--recipes-containers/riddler/riddler_git.bb1
2 files changed, 3 insertions, 2 deletions
diff --git a/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch b/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch
index 8098562e..0c4f3fd2 100644
--- a/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch
+++ b/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch
@@ -17,12 +17,12 @@ index c6976af..f3c8d17 100644
17 build: 17 build:
18 @echo "+ $@" 18 @echo "+ $@"
19- @go build -tags "$(BUILDTAGS) cgo" . 19- @go build -tags "$(BUILDTAGS) cgo" .
20+ @${GO} build -tags "$(BUILDTAGS) cgo" . 20+ @${GO} build ${GOBUILDFLAGS} -tags "$(BUILDTAGS) cgo" .
21 21
22 static: 22 static:
23 @echo "+ $@" 23 @echo "+ $@"
24- CGO_ENABLED=1 go build -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static" -o riddler . 24- CGO_ENABLED=1 go build -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static" -o riddler .
25+ CGO_ENABLED=1 ${GO} build -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static" -o riddler . 25+ CGO_ENABLED=1 ${GO} build ${GOBUILDFLAGS} -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static" -o riddler .
26 26
27 fmt: 27 fmt:
28 @echo "+ $@" 28 @echo "+ $@"
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb
index e1033312..191becfe 100644
--- a/recipes-containers/riddler/riddler_git.bb
+++ b/recipes-containers/riddler/riddler_git.bb
@@ -47,6 +47,7 @@ do_compile() {
47 export CGO_CFLAGS="${TARGET_CFLAGS}" 47 export CGO_CFLAGS="${TARGET_CFLAGS}"
48 export CGO_LDFLAGS="${TARGET_LDFLAGS}" 48 export CGO_LDFLAGS="${TARGET_LDFLAGS}"
49 export GO111MODULE=off 49 export GO111MODULE=off
50 export GOBUILDFLAGS="-trimpath"
50 51
51 cd ${S}/src/import 52 cd ${S}/src/import
52 53