aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-06-09 17:27:23 +0100
committerJoshua Lock <josh@linux.intel.com>2010-06-09 17:32:01 +0100
commit2e0e24e849c80a4bfde0e762ed1117a85025c769 (patch)
tree2181b2d49753a07d410a5c220c9d070374a1eadd
parent61a730184b25b2e3b33578aff06aba4efa77e779 (diff)
downloadopenembedded-core-contrib-2e0e24e849c80a4bfde0e762ed1117a85025c769.tar.gz
openembedded-core-contrib-2e0e24e849c80a4bfde0e762ed1117a85025c769.tar.bz2
openembedded-core-contrib-2e0e24e849c80a4bfde0e762ed1117a85025c769.zip
scripts: Fix setting up links to cc and gcc in runqemu
Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rwxr-xr-xscripts/runqemu16
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 2ab01d9257..5b44402579 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -137,11 +137,21 @@ if [ "$MACHINE" = "qemux86" ]; then
findimage $T qemux86 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
fi
fi
- CROSSPATH=$BUILDDIR/sysroots/$BUILD_SYS/i586-poky-linux/bin
+ CROSSPATH=$BUILDDIR/tmp/sysroots/$BUILD_SYS/usr
fi
-if [ ! -e $CROSSPATH/cc ]; then
- ln -s $CROSSPATH/gcc $CROSSPATH/cc
+if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then
+ TARGET_SYS="arm-poky-linux"
+elif [ "$MACHINE" = "qemux86" ]; then
+ TARGET_SYS="i586-poky-linux"
+fi
+
+if [ ! -e $CROSSPATH/$TARGET_SYS/bin/cc ]; then
+ ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/$TARGET_SYS/bin/cc
+fi
+
+if [ ! -e $CROSSPATH/$TARGET_SYS/bin/gcc ]; then
+ ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/$TARGET_SYS/bin/gcc
fi
CROSSPATH=$BUILDDIR/tmp/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH:$BUILDDIR/tmp/cross/bin