diff options
author | Richard Purdie <richard@openedhand.com> | 2006-05-27 21:49:50 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-05-27 21:49:50 +0000 |
commit | 3097ab0f62233dc336dfe611fef4b8b633355190 (patch) | |
tree | 8173abc003c9703cf625d4e100f57d3d5141177d /openembedded/conf/bitbake.conf | |
parent | b77fcc05cacdf70819cc226d53156a9e70e84e04 (diff) | |
download | openembedded-core-3097ab0f62233dc336dfe611fef4b8b633355190.tar.gz openembedded-core-3097ab0f62233dc336dfe611fef4b8b633355190.tar.bz2 openembedded-core-3097ab0f62233dc336dfe611fef4b8b633355190.tar.xz openembedded-core-3097ab0f62233dc336dfe611fef4b8b633355190.zip |
Sync conf and classes with OE - changes have been tested and don't affect poky
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@446 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/bitbake.conf')
-rw-r--r-- | openembedded/conf/bitbake.conf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf index 2043a500e..9c1ba1f47 100644 --- a/openembedded/conf/bitbake.conf +++ b/openembedded/conf/bitbake.conf @@ -57,6 +57,7 @@ TARGET_CC_ARCH = "" PACKAGE_ARCH = "${HOST_ARCH}" MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" +IPKG_ARCHS = "all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}" ################################################################## # Date/time variables. @@ -239,9 +240,9 @@ EXTRA_OEMAKE = "-e MAKEFLAGS=" # Build flags and options. ################################################################## -export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" +export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include" export CPPFLAGS = "${TARGET_CPPFLAGS}" -export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" +export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include" export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" export CFLAGS = "${TARGET_CFLAGS}" @@ -382,7 +383,9 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything. # # This works for functions as well, they are really just environment variables. -OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}" +#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}" +# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon +OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast" ################################################################## # Include the rest of the config files. |