diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2022-06-12 01:00:07 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-06-20 12:09:46 -0400 |
commit | 0bad7905e5ea3bc0b36560a2c60fb7b842f6efc1 (patch) | |
tree | 73c4a3597866b1501ef2530da04cbe57e85c5d23 /recipes-containers | |
parent | 08d50052bef68686c71b5021ff53dbc41af1f945 (diff) | |
download | meta-virtualization-0bad7905e5ea3bc0b36560a2c60fb7b842f6efc1.tar.gz |
riddler: adjust GOROOT, CGO_CFLAGS and CGO_LDFALGS
Adjust the GOROOT setting as directory specified by the original
one does not exist.
The CGO_CFLAGS and CGO_LDFLAGS should use target flags instead
of the nativesdk ones.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r-- | recipes-containers/riddler/riddler_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb index be751d62..e1033312 100644 --- a/recipes-containers/riddler/riddler_git.bb +++ b/recipes-containers/riddler/riddler_git.bb | |||
@@ -26,7 +26,7 @@ EXTRA_OEMAKE="BUILDTAGS=''" | |||
26 | 26 | ||
27 | do_compile() { | 27 | do_compile() { |
28 | export GOARCH="${TARGET_GOARCH}" | 28 | export GOARCH="${TARGET_GOARCH}" |
29 | export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" | 29 | export GOROOT="${STAGING_LIBDIR}/go" |
30 | # Setup vendor directory so that it can be used in GOPATH. | 30 | # Setup vendor directory so that it can be used in GOPATH. |
31 | # | 31 | # |
32 | # Go looks in a src directory under any directory in GOPATH but riddler | 32 | # Go looks in a src directory under any directory in GOPATH but riddler |
@@ -44,8 +44,8 @@ do_compile() { | |||
44 | export CGO_ENABLED="1" | 44 | export CGO_ENABLED="1" |
45 | export CFLAGS="" | 45 | export CFLAGS="" |
46 | export LDFLAGS="" | 46 | export LDFLAGS="" |
47 | export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}" | 47 | export CGO_CFLAGS="${TARGET_CFLAGS}" |
48 | export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" | 48 | export CGO_LDFLAGS="${TARGET_LDFLAGS}" |
49 | export GO111MODULE=off | 49 | export GO111MODULE=off |
50 | 50 | ||
51 | cd ${S}/src/import | 51 | cd ${S}/src/import |