From 949ca194407a7df9037a9dd7baaa0c404c4ef593 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Tue, 19 Dec 2017 00:07:41 +0100 Subject: [PATCH] mksh: better build --- cross/pkgs/mksh/build.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cross/pkgs/mksh/build.sh b/cross/pkgs/mksh/build.sh index 8820b71..2194d95 100755 --- a/cross/pkgs/mksh/build.sh +++ b/cross/pkgs/mksh/build.sh @@ -41,6 +41,7 @@ echo -n Building mksh. dotter=$! cd $MKSH +rm -f $MKSH/mksh.build.log function failOnError { # $1 -> exit status on a previous command @@ -59,21 +60,17 @@ function failOnError { fi } -export TARGET_OS=Jehanne -export CC=x86_64-jehanne-gcc -export MKSHRC_PATH='~/lib/mkshrc' - ( git clean -xdf . && mkdir $MKSH_BUILD && cd $MKSH_BUILD && - sh ../src/Build.sh && + TARGET_OS=Jehanne CC=x86_64-jehanne-gcc MKSHRC_PATH='~/lib/mkshrc' sh ../src/Build.sh && cp mksh $JEHANNE/arch/amd64/cmd/ && sed -e '3,$s/\bbin\b/cmd/g' ../src/dot.mkshrc > mkshrc && mkdir -p $JEHANNE/arch/mksh/lib && cp mkshrc $JEHANNE/arch/mksh/lib && cp mkshrc $JEHANNE/usr/glenda/lib -) > $MKSH/mksh.build.log 2>&1 +) > mksh.build.log 2>&1 failOnError $? "building mksh"