JehanneOS/devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

mksh: simplify Build.sh

Browse Source
This commit is contained in:
Giacomo Tesio
2017-12-21 07:49:37 +01:00
parent 3ad20858a4
commit 33779334f1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cross/pkgs/mksh/build.sh
View File

@@ -26,6 +26,9 @@ export CROSS_DIR=$JEHANNE/hacking/cross
export MKSH=$CROSS_DIR/pkgs/mksh/ export MKSH=$CROSS_DIR/pkgs/mksh/
export MKSH_SRC=$MKSH/src/ export MKSH_SRC=$MKSH/src/
export MKSH_BUILD=$MKSH/out/ export MKSH_BUILD=$MKSH/out/
export MKSHRC_PATH='~/lib/mkshrc'
export LIBS="$JEHANNE/arch/$ARCH/lib/newlib/libc.a $JEHANNE/arch/$ARCH/lib/newlib/libm.a $JEHANNE/arch/$ARCH/lib/newlib/libg.a -lposix -lc"
export CPPFLAGS="-I$JEHANNE/sys/posix/newlib/ '-DMKSHRC_PATH=\"$MKSHRC_PATH\"' '-DARCH=\"$ARCH\"'"
export LD_PRELOAD= export LD_PRELOAD=
@@ -40,9 +43,6 @@ echo -n Building mksh.
) & ) &
dotter=$! dotter=$!
cd $MKSH
rm -f $MKSH/mksh.build.log
function failOnError { function failOnError {
# $1 -> exit status on a previous command # $1 -> exit status on a previous command
# $2 -> task description # $2 -> task description
@@ -61,16 +61,21 @@ function failOnError {
} }
( (
# rm -f $MKSH/mksh.build.log &&
date > $MKSH/mksh.build.log &&
cd $MKSH &&
git clean -xdf . && git clean -xdf . &&
mkdir $MKSH_BUILD && mkdir $MKSH_BUILD &&
cd $MKSH_BUILD && cd $MKSH_BUILD &&
TARGET_OS=Jehanne CC=x86_64-jehanne-gcc MKSHRC_PATH='~/lib/mkshrc' sh ../src/Build.sh && TARGET_OS=Jehanne CC=x86_64-jehanne-gcc sh ../src/Build.sh &&
cp mksh $JEHANNE/arch/amd64/cmd/ && cp mksh $JEHANNE/arch/amd64/cmd/sh &&
sed -e '3,$s/\bbin\b/cmd/g' ../src/dot.mkshrc > mkshrc && sed -e '3,$s/\bbin\b/cmd/g' ../src/dot.mkshrc > mkshrc &&
echo "mksh installed at $JEHANNE/arch/amd64/cmd/sh"
mkdir -p $JEHANNE/arch/mksh/lib && mkdir -p $JEHANNE/arch/mksh/lib &&
cp mkshrc $JEHANNE/arch/mksh/lib && cp mkshrc $JEHANNE/arch/mksh/lib &&
cp mkshrc $JEHANNE/usr/glenda/lib cp mkshrc $JEHANNE/usr/glenda/lib &&
) > mksh.build.log 2>&1 echo "mkshrc installed at $JEHANNE/arch/mksh/lib and $JEHANNE/usr/glenda/lib"
) >> $MKSH/mksh.build.log 2>&1
failOnError $? "building mksh" failOnError $? "building mksh"