summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-25 10:01:30 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-25 10:01:30 +0000
commit4f249a8efbced11400f99c182ef101b7c00e7ba8 (patch)
tree03766f69c5fd2b6a4d1f3d8936cdf6c6d32b8989 /meta/conf
parent82dd73248db6eb9be25db48081a573d7027a204f (diff)
downloadpoky-4f249a8efbced11400f99c182ef101b7c00e7ba8.tar.gz
Fix STAGING_BINDIR for multimachine use by spliting into STAGING_BINDIR and STAGING_BINDIR_NATIVE and adding both to PATH
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@958 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 21d68801e7..9f77c82e06 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -156,7 +156,8 @@ S = "${WORKDIR}/${P}"
156B = "${S}" 156B = "${S}"
157 157
158STAGING_DIR = "${TMPDIR}/staging" 158STAGING_DIR = "${TMPDIR}/staging"
159STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin" 159STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
160STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
160STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" 161STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
161STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" 162STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
162STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" 163STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
@@ -218,7 +219,7 @@ EXTRA_IMAGEDEPENDS = ""
218 219
219CROSS_DIR = "${TMPDIR}/cross" 220CROSS_DIR = "${TMPDIR}/cross"
220CROSS_DATADIR = "${CROSS_DIR}/share" 221CROSS_DATADIR = "${CROSS_DIR}/share"
221export PATH_prepend = "${STAGING_BINDIR}/${HOST_SYS}:${STAGING_BINDIR}:${CROSS_DIR}/bin:" 222export PATH_prepend = "${STAGING_BINDIR}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:"
222 223
223################################################################## 224##################################################################
224# Build utility info. 225# Build utility info.