From 39fae5b646fb7a49aa14edc989633e47343f26dc Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 21 Oct 2010 14:55:05 -0700 Subject: [PATCH] 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 --- conf/build/Power Macintosh-darwin.conf | 5 ++++- conf/build/darwin/utilities.inc | 9 +++++++++ conf/build/i386-darwin.conf | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 conf/build/darwin/utilities.inc 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 -- 2.39.5