diff options
| -rw-r--r-- | meta/conf/bitbake.conf | 11 | ||||
| -rw-r--r-- | meta/conf/distro/include/poky-external.inc | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 166d98686..31e3e2979 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -297,12 +297,13 @@ export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbi ################################################################## CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}" +TOOLCHAIN_OPTIONS = "" -export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" -export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" -export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" -export CPP = "${HOST_PREFIX}gcc -E" -export LD = "${HOST_PREFIX}ld" +export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS}" +export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS}" export CCLD = "${CC}" export AR = "${HOST_PREFIX}ar" export AS = "${HOST_PREFIX}as" diff --git a/meta/conf/distro/include/poky-external.inc b/meta/conf/distro/include/poky-external.inc index f95340b3a..50b250bce 100644 --- a/meta/conf/distro/include/poky-external.inc +++ b/meta/conf/distro/include/poky-external.inc @@ -23,7 +23,8 @@ PREFERRED_PROVIDER_virtual/libiconv = "external-poky-toolchain" PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain" PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain" -TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include --sysroot=${STAGING_DIR_HOST} " -TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib --sysroot=${STAGING_DIR_HOST} " +TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include " +TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib " TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}" +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}" |