| Message ID | 20220728114046.3529197-2-Martin.Jansa@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [RFC] bitbake.conf: introduce LINKER/BUILD_LINKER variables | expand |
On Thu, Jul 28, 2022 at 7:41 AM Martin Jansa <Martin.Jansa@gmail.com> wrote: > * makes it a bit easier to replace ld with ld.bfd or some other > implementation > in LD/BUILD_LD variables without changing this whole variable and without > depending on ld-is-gold to set ld symlink to preferred implementation (or > when we want to force different one for specific recipe, e.g. forcing bfd > where gold fails, like in ltp) This is fixing bare ld calls but there are perhaps handful of recipes where bare ld is used in most of the cases we rely on compiler driver to do the linking and this confuses that use case. > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > meta/conf/bitbake.conf | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index 1d36aae8b3..1c2ebf333e 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -553,7 +553,8 @@ export CC = "${CCACHE}${HOST_PREFIX}gcc > ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" > export CXX = "${CCACHE}${HOST_PREFIX}g++ > ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" > export FC = "${CCACHE}${HOST_PREFIX}gfortran > ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" > export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" > -export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}" > +LINKER = "ld" > +export LD = "${HOST_PREFIX}${LINKER}${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}" > export CCLD = "${CC}" > export AR = "${HOST_PREFIX}gcc-ar" > export AS = "${HOST_PREFIX}as ${HOST_AS_ARCH}" > @@ -570,7 +571,8 @@ export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc > ${BUILD_CC_ARCH}" > export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" > export BUILD_FC = "${CCACHE}${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH}" > export BUILD_CPP = "${BUILD_PREFIX}gcc ${BUILD_CC_ARCH} -E" > -export BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" > +BUILD_LINKER = "ld" > +export BUILD_LD = "${BUILD_PREFIX}${BUILD_LINKER} ${BUILD_LD_ARCH}" > export BUILD_CCLD = "${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" > export BUILD_AR = "${BUILD_PREFIX}ar" > export BUILD_AS = "${BUILD_PREFIX}as ${BUILD_AS_ARCH}" > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#168601): > https://lists.openembedded.org/g/openembedded-core/message/168601 > Mute This Topic: https://lists.openembedded.org/mt/92668261/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 1d36aae8b3..1c2ebf333e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -553,7 +553,8 @@ export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" export FC = "${CCACHE}${HOST_PREFIX}gfortran ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" -export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}" +LINKER = "ld" +export LD = "${HOST_PREFIX}${LINKER}${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}" export CCLD = "${CC}" export AR = "${HOST_PREFIX}gcc-ar" export AS = "${HOST_PREFIX}as ${HOST_AS_ARCH}" @@ -570,7 +571,8 @@ export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" export BUILD_FC = "${CCACHE}${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH}" export BUILD_CPP = "${BUILD_PREFIX}gcc ${BUILD_CC_ARCH} -E" -export BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" +BUILD_LINKER = "ld" +export BUILD_LD = "${BUILD_PREFIX}${BUILD_LINKER} ${BUILD_LD_ARCH}" export BUILD_CCLD = "${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" export BUILD_AR = "${BUILD_PREFIX}ar" export BUILD_AS = "${BUILD_PREFIX}as ${BUILD_AS_ARCH}"
* makes it a bit easier to replace ld with ld.bfd or some other implementation in LD/BUILD_LD variables without changing this whole variable and without depending on ld-is-gold to set ld symlink to preferred implementation (or when we want to force different one for specific recipe, e.g. forcing bfd where gold fails, like in ltp) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/conf/bitbake.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)