diff options
| author | Tom Rini <trini@embeddedalley.com> | 2009-01-28 19:21:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-01-28 19:21:21 -0500 |
| commit | 70ac9ba6487fc109318507a4bd36adc58faebdff (patch) | |
| tree | d52bc492874ad2426d113267aef211928de5a8bc /conf | |
| parent | faaf61b6d4a8efc2e0b90a5d2dc08661db63b3d3 (diff) | |
| parent | 6638d03ac6f88d30dfc904a1e20f9d3c5d73fa70 (diff) | |
Merge branch 'trini/canadian-final-merge' into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index effa67003d..7c9dceee5f 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -89,6 +89,14 @@ TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" TARGET_EXEEXT = "" +SDK_ARCH ?= "${BUILD_ARCH}" +SDK_OS ?= "${BUILD_OS}" +SDK_VENDOR ?= "${BUILD_VENDOR}" +SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}" +SDK_PREFIX = "${SDK_SYS}-" +SDK_CC_ARCH ?= "${BUILD_CC_ARCH}" +SDK_EXEEXT = "" + # A shortcut for the commonly used value EXEEXT = "${HOST_EXEEXT}" @@ -274,6 +282,8 @@ STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" # specific packages - hack around it for now. STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" +STAGING_DIR_SDK = "${STAGING_DIR}/${SDK_SYS}" + DEPLOY_DIR = "${TMPDIR}/deploy" DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" @@ -400,14 +410,17 @@ PATCHRESOLVE = 'noop' export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}" export CPPFLAGS = "${TARGET_CPPFLAGS}" export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${layout_includedir} -isystem${STAGING_DIR_HOST}${layout_includedir}" export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" export CFLAGS = "${TARGET_CFLAGS}" export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}" +export SDK_CFLAGS = "${SDK_CPPFLAGS} ${SELECTED_OPTIMIZATION}" export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -fpermissive" export CXXFLAGS = "${TARGET_CXXFLAGS}" export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive" +export SDK_CXXFLAGS = "${SDK_CFLAGS} -fpermissive" export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ @@ -418,6 +431,9 @@ export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \ -Wl,-O1 \ ${TARGET_LINK_HASH_STYLE}" +export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${layout_libdir} \ + -Wl,-rpath-link,${STAGING_DIR_SDK}${layout_libdir} \ + -Wl,-O1" # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? ALLOWED_FLAGS = "-O -mcpu -march -pipe" |