| Message ID | 20220112152806.1754604-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | go-runtime: fix building without SECURITY_LDFLAGS | expand |
Thanks, this needs to be done in go-target.inc too. Alex On Wed, 12 Jan 2022 at 16:28, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > Commit 9985b17a30bb ("go: correctly set debug-prefix-map and build > directory") has changed CGO_LDFLAGS to the manually crafted version of > LDFLAGS to strip out DEBUG_PREFIX_MAP contents. > > However this manually crafted version includes ${SECURITY_LDFLAGS}. > > If security_flags.inc is not included, the variable is not defined, thus > CGO_LDFLAGS will include the '${SECURITY_LDFLAGS}' literally. When > building the recipe, the build would break with the follwing message: > > aarch64-linaro-linux-gcc: error: ${SECURITY_LDFLAGS}: No such file or > directory > > So, instead of manually specifying variable contents, perform the > expected action: filter offending arguments out of LDFLAGS. > > Cc: Alexander Kanavin <alex.kanavin@gmail.com> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > meta/recipes-devtools/go/go-runtime.inc | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-devtools/go/go-runtime.inc > b/meta/recipes-devtools/go/go-runtime.inc > index a08d44dd3a8c..ccb86d4fe9a6 100644 > --- a/meta/recipes-devtools/go/go-runtime.inc > +++ b/meta/recipes-devtools/go/go-runtime.inc > @@ -10,7 +10,8 @@ DEBUG_PREFIX_MAP = "\ > export CGO_CFLAGS = "${CFLAGS}" > export CGO_CPPFLAGS = "${CPPFLAGS}" > export CGO_CXXFLAGS = "${CXXFLAGS}" > -export CGO_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE} ${ASNEEDED} > ${SECURITY_LDFLAGS}" > +# Filter out -fdebug-prefix-map options as they clash with the GO's build > system > +export CGO_LDFLAGS = "${@ ' '.join(filter(lambda f: not > f.startswith('-fdebug-prefix-map'), d.getVar('LDFLAGS').split())) }" > export GOCACHE = "${B}/.cache" > > GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" > -- > 2.30.2 > >
diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index a08d44dd3a8c..ccb86d4fe9a6 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc @@ -10,7 +10,8 @@ DEBUG_PREFIX_MAP = "\ export CGO_CFLAGS = "${CFLAGS}" export CGO_CPPFLAGS = "${CPPFLAGS}" export CGO_CXXFLAGS = "${CXXFLAGS}" -export CGO_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE} ${ASNEEDED} ${SECURITY_LDFLAGS}" +# Filter out -fdebug-prefix-map options as they clash with the GO's build system +export CGO_LDFLAGS = "${@ ' '.join(filter(lambda f: not f.startswith('-fdebug-prefix-map'), d.getVar('LDFLAGS').split())) }" export GOCACHE = "${B}/.cache" GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}"
Commit 9985b17a30bb ("go: correctly set debug-prefix-map and build directory") has changed CGO_LDFLAGS to the manually crafted version of LDFLAGS to strip out DEBUG_PREFIX_MAP contents. However this manually crafted version includes ${SECURITY_LDFLAGS}. If security_flags.inc is not included, the variable is not defined, thus CGO_LDFLAGS will include the '${SECURITY_LDFLAGS}' literally. When building the recipe, the build would break with the follwing message: aarch64-linaro-linux-gcc: error: ${SECURITY_LDFLAGS}: No such file or directory So, instead of manually specifying variable contents, perform the expected action: filter offending arguments out of LDFLAGS. Cc: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- meta/recipes-devtools/go/go-runtime.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)