cookutils rev 374
cross: add support for --config=/path/to/cross.conf
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri May 11 14:43:34 2012 +0200 (2012-05-11) |
parents | e8c2be9bd8fe |
children | e31ed673ab5d |
files | cross cross.conf |
line diff
1.1 --- a/cross Fri May 11 14:23:28 2012 +0200 1.2 +++ b/cross Fri May 11 14:43:34 2012 +0200 1.3 @@ -10,6 +10,9 @@ 1.4 [ -f "/etc/slitaz/cross.conf" ] && . /etc/slitaz/cross.conf 1.5 [ -f "cross.conf" ] && . ./cross.conf 1.6 1.7 +# Handle --config=/path/to/cross.conf 1.8 +[ "$config" ] && . $config 1.9 + 1.10 # Help and usage. 1.11 usage() { 1.12 cat << EOT 1.13 @@ -100,6 +103,7 @@ 1.14 mkdir gcc-static && cd gcc-static 1.15 ../gcc-$GCC_VERSION/configure \ 1.16 --prefix=$PREFIX \ 1.17 + --libexec=$PREFIX/lib \ 1.18 --target=$TARGET \ 1.19 --disable-shared \ 1.20 --disable-threads \ 1.21 @@ -166,6 +170,7 @@ 1.22 mkdir gcc-build && cd gcc-build 1.23 ../gcc-$GCC_VERSION/configure \ 1.24 --prefix=$PREFIX \ 1.25 + --libexec=$PREFIX/lib \ 1.26 --target=$TARGET \ 1.27 --enable-shared \ 1.28 --enable-languages=c,c++ \ 1.29 @@ -203,14 +208,20 @@ 1.30 init_compile 1.31 CC=${TARGET}-gcc 1.32 echo -e "\nCross Toolchain iformation" && separator 1.33 + [ "$config" ] && echo "Config file : $config" 1.34 cat << EOT 1.35 -Target arch : $ARCH 1.36 -C Compiler : $CC 1.37 -Additonal path: /usr/cross/$ARCH/bin 1.38 +Target arch : $ARCH 1.39 +C Compiler : $CC 1.40 +Additonal path : /usr/cross/$ARCH/bin 1.41 +Build directory : $WORK 1.42 EOT 1.43 separator && echo "" 1.44 echo "GCC version" && separator 1.45 - $CC -v 1.46 + if [ -x "$PREFIX/$CC" ]; then 1.47 + $CC -v 1.48 + else 1.49 + echo "No C compiler. To build a toolchain run: cross compile" 1.50 + fi 1.51 separator && echo "" ;; 1.52 testsuite) 1.53 init_compile
2.1 --- a/cross.conf Fri May 11 14:23:28 2012 +0200 2.2 +++ b/cross.conf Fri May 11 14:43:34 2012 +0200 2.3 @@ -5,7 +5,7 @@ 2.4 ARCH=arm 2.5 BUILD_SYSTEM=i486-slitaz-linux 2.6 TARGET=$ARCH-slitaz-linux-gnueabi 2.7 -WORK=$(pwd) 2.8 +WORK=/home/slitaz/cross 2.9 SRC=/home/slitaz/src 2.10 PREFIX=/usr/cross/$ARCH 2.11