diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-10-21 14:55:05 -0700 |
---|---|---|
committer | Chris Larson <chris_larson@mentor.com> | 2010-10-21 20:30:13 -0700 |
commit | 39fae5b646fb7a49aa14edc989633e47343f26dc (patch) | |
tree | 798b71351483b01e3208e2eec412c86de7a1c73a /conf | |
parent | 1f94eb989a4f150a7a2a5514d3e29ac3ff2557e0 (diff) | |
download | openembedded-39fae5b646fb7a49aa14edc989633e47343f26dc.tar.gz |
conf/build: darwin fixups - COMMAND_MODE, -m32, PATH
- For ppc darwin, use the wrapper scripts
- For i386 darwin, set -m32, as uname shows i386 even on 64 bit darwin
- For i386 and ppc darwin, set COMMAND_MODE to fix incompatible shell utility
behavior, for example 'echo' not handling -n as expected
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/build/Power Macintosh-darwin.conf | 5 | ||||
-rw-r--r-- | conf/build/darwin/utilities.inc | 9 | ||||
-rw-r--r-- | conf/build/i386-darwin.conf | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/conf/build/Power Macintosh-darwin.conf b/conf/build/Power Macintosh-darwin.conf index f56c09243e..effddbf1c9 100644 --- a/conf/build/Power Macintosh-darwin.conf +++ b/conf/build/Power Macintosh-darwin.conf @@ -1 +1,4 @@ -BUILD_ARCH="powerpc" +PATH =. "${@bb.which('${BBPATH}', 'bin')}:" +BUILD_ARCH = "powerpc" + +require conf/build/darwin/utilities.inc diff --git a/conf/build/darwin/utilities.inc b/conf/build/darwin/utilities.inc new file mode 100644 index 0000000000..9497524e7a --- /dev/null +++ b/conf/build/darwin/utilities.inc @@ -0,0 +1,9 @@ +python darwin_utilities_fixup() { + import os + import bb.event + + if isinstance(e, bb.event.ConfigParsed): + os.environ["COMMAND_MODE"] = "legacy" +} + +addhandler darwin_utilities_fixup diff --git a/conf/build/i386-darwin.conf b/conf/build/i386-darwin.conf index e7ca06c1ee..c9e81b9c5d 100644 --- a/conf/build/i386-darwin.conf +++ b/conf/build/i386-darwin.conf @@ -1 +1,4 @@ PATH =. "${@bb.which('${BBPATH}', 'bin')}:" +BUILD_CC_ARCH += "-m32" + +require conf/build/darwin/utilities.inc |