summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauri Leukkunen <lle@rahina.org>2007-02-11 20:49:55 +0200
committerLauri Leukkunen <lleukkun@leka.rahina.org>2007-02-11 20:49:55 +0200
commit244b23f704f5de4b31f3bde02a73dc469560153a (patch)
tree8c8c9b1a1f559f11328b656c42dbfff0ee3ad11d
parentbff2a8bc2f73012e870af713568f5ee899718cbd (diff)
Remove sb1 toolchain wrapping dependency
With these changes sb2 can use an as-is copy of CodeSourcery arm-2006q3 toolchain.
-rw-r--r--etc/sb2.config.sample14
-rwxr-xr-xutils/sb22
2 files changed, 9 insertions, 7 deletions
diff --git a/etc/sb2.config.sample b/etc/sb2.config.sample
index 6eb4fa3..74a49d0 100644
--- a/etc/sb2.config.sample
+++ b/etc/sb2.config.sample
@@ -1,20 +1,22 @@
# Scratchbox2 configuration file.
-# This file is identical to SB1 target config files.
+# This file works with Code Sourcery 2006q3 arm linux gnueabi toolchain.
+# Modify SBOX_CPUTRANSPARENY_METHOD and SBOX_CROSS_GCC_DIR to suit your
+# paths.
SBOX_TARGET_NAME=arm
SBOX_CPU=arm
SBOX_OS=none-linux-gnueabi
SBOX_CLIB=glibc
-SBOX_CPUTRANSPARENCY_METHOD=/home/lleukkun/scratchbox/bin/qemu-arm
+SBOX_CPUTRANSPARENCY_METHOD=$HOME/scratchbox/bin/qemu-arm
SBOX_DEFAULT_GCC_PREFIX=arm-none-linux-gnueabi-
-SBOX_TARGET_SETUP_SCRIPT=/scratchbox/compilers/arm-linux-2006q1-6/target_setup.sh
+SBOX_TARGET_SETUP_SCRIPT=
SBOX_CROSS_GCC_NAME=arm-linux-2006q3-27
SBOX_CROSS_GCC_PREFIX_LIST=arm-linux-gnueabi-:arm-linux-:arm-none-linux-gnueabi-
-SBOX_CROSS_GCC_SUBST_PREFIX=sbox-arm-none-linux-gnueabi-
-SBOX_CROSS_GCC_SPECS_FILE=/scratchbox/compilers/arm-linux-2006q3-27/gcc.specs
-SBOX_CROSS_GCC_DIR=/scratchbox/compilers/arm-linux-2006q3-27/bin
+SBOX_CROSS_GCC_SUBST_PREFIX=arm-none-linux-gnueabi-
+SBOX_CROSS_GCC_SPECS_FILE=
+SBOX_CROSS_GCC_DIR=$HOME/compilers/arm-2006q3/bin
SBOX_CROSS_GCC_LD_ARGS=
SBOX_HOST_GCC_NAME=host-gcc
diff --git a/utils/sb2 b/utils/sb2
index 915d787..d625359 100755
--- a/utils/sb2
+++ b/utils/sb2
@@ -35,7 +35,7 @@ cd $SBOX_TARGET_ROOT
HOST_GCC_INC_DIR=$(echo "#include <stdio.h>" | gcc -M -E - | perl -e 'while(<STDIN>) { $foo{$1} = 1 if m/\/usr([^[:space:]]*\/include)/;}; foreach my $k (keys %foo) {print " -isystem $ENV{SBOX_DIR}/share/scratchbox2/host_usr$k"};')
-export PATH=$PATH:$SBOX_DIR/bin
+export PATH=$SBOX_TARGET_ROOT/bin:$SBOX_TARGET_ROOT/usr/bin:$SBOX_TARGET_ROOT/usr/local/bin:$PATH:$SBOX_DIR/bin
export LD_PRELOAD=$SBOX_LIBSB2
export SBOX_EXTRA_HOST_COMPILER_ARGS="$HOST_GCC_INC_DIR"
export SBOX_EXTRA_TARGET_COMPILER_ARGS="-isystem /usr/local/include -isystem /usr/include"