diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-12-31 22:31:24 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-12-31 22:31:24 +0000 |
| commit | 9bd213b23e9095cc0aa94952cc345a110a5cdc40 (patch) | |
| tree | 4f862fbb29bc438fe7f45f679934a4ec0b91a436 /conf/bitbake.conf | |
| parent | bbd81bb3d973f809636c55c56bdc5b6ec863bfa0 (diff) | |
Split STAGING_BINDIR into CROSS and NATIVE versions. This means there is no need to rename -config scripts and multimachine won't break with binconfig.bbclass. ***NOTE: This change will require staging to be rebuilt***
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 36e1287d03..6ddf8ecaf4 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -153,10 +153,9 @@ S = "${WORKDIR}/${P}" B = "${S}" STAGING_DIR = "${TMPDIR}/staging" -STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin" -# Set these to the same a STAGING_BINDIR for now +STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin" +STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin" -STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin" STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" @@ -217,7 +216,7 @@ EXTRA_IMAGEDEPENDS = "" CROSS_DIR = "${TMPDIR}/cross" CROSS_DATADIR = "${CROSS_DIR}/share" -export PATH_prepend = "${STAGING_BINDIR}/${HOST_SYS}:${STAGING_BINDIR}:${CROSS_DIR}/bin:" +export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:" ################################################################## # Build utility info. |