diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:50:30 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:50:30 +0000 |
| commit | e49ed8da00b7a5d874fd92a806c6b036a726069c (patch) | |
| tree | 4c2986b1f377b0363e6637cc792e8e553c2b39a4 /conf/bitbake.conf | |
| parent | 95580064683ef83263017dce9b610c74306348bb (diff) | |
| parent | a5ab4c1e92a80b977b53072b349e05ab0f097dd1 (diff) | |
merge of '6765ce1f621a9ef917ba1521afc7b81013e14dc2'
and 'fcc520f13c2e5df6e6b7d52dcbfb32cb1750c941'
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9d5d54bfb8..ac2d281123 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,7 @@ HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" HOST_PREFIX = "${TARGET_PREFIX}" HOST_CC_ARCH = "${TARGET_CC_ARCH}" -TARGET_ARCH = "INVALID" +TARGET_ARCH ?= "INVALID" TARGET_OS = "INVALID" TARGET_VENDOR = "${BUILD_VENDOR}" TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" @@ -311,12 +311,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" @@ -587,6 +588,7 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "vfat", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ |