# HG changeset patch # User Rob Landley # Date 1255375657 18000 # Node ID 444c36a378419c8fce874f38a31ee862594d7c77 # Parent 2ca7ea5d3ec15460ba231442f5c32bafe04a6c8c# Parent ea9af6c73dbf1d4ada93faaa96201aef832d21b5 I am never pulling from an external tree again. Send me diffs, it refuses to merge if I have local in my working store, which has _NOTHING_ to do with the repository. That's INSANE. diff -r 2ca7ea5d3ec1 -r 444c36a37841 sources/functions.sh --- a/sources/functions.sh Sun Oct 11 01:56:04 2009 -0500 +++ b/sources/functions.sh Mon Oct 12 14:27:37 2009 -0500 @@ -50,7 +50,7 @@ # Setup directories and add the cross compiler to the start of the path. - STAGE_DIR="$BUILD/${STAGE_NAME}-${ARCH}" + STAGE_DIR="$BUILD/${STAGE_NAME}-${ARCH_NAME}" export PATH="${BUILD}/cross-compiler-$ARCH/bin:$PATH" [ "$FROM_ARCH" != "$ARCH" ] &&