build: Use bash if available to avoid dash problems.
* configure: Set SHELL to bash. * configure.sh: Likewise. * build-aux/test-suite.sh (TEST_LOGS): * build-aux/export.make: Export SHELL. * build-aux/config.sh.in (SHELL): New substitute, export. * build-aux/config.make.in (SHELL): New substitute. * build-aux/GNUmakefile.in (build, check, install, uninstall): Use $SHELL to avoid dash problems. * build-aux/check-mescc.sh: Likewise. * build-aux/build.sh.in: Likewise. * build-aux/check-mes.sh: Likewise. * build-aux/check.sh.in: Likewise.
This commit is contained in:
parent
06a85ca9e0
commit
1ba8bf539a
|
@ -92,7 +92,7 @@ all: doc
|
||||||
doc: build
|
doc: build
|
||||||
|
|
||||||
build:
|
build:
|
||||||
./build.sh
|
$(SHELL) build.sh
|
||||||
|
|
||||||
src/${program_prefix}mes: build
|
src/${program_prefix}mes: build
|
||||||
|
|
||||||
|
@ -129,20 +129,20 @@ clean-go:
|
||||||
rm -f $(shell find . -name '*.go')
|
rm -f $(shell find . -name '*.go')
|
||||||
|
|
||||||
check:
|
check:
|
||||||
./check.sh
|
$(SHELL) check.sh
|
||||||
|
|
||||||
check-mescc:
|
check-mescc:
|
||||||
./pre-inst-env build-aux/check-mescc.sh
|
$(SHELL) pre-inst-env build-aux/check-mescc.sh
|
||||||
|
|
||||||
# Mes does not feature post-install checks yet, so we're great!
|
# Mes does not feature post-install checks yet, so we're great!
|
||||||
installcheck:
|
installcheck:
|
||||||
true
|
true
|
||||||
|
|
||||||
install:
|
install:
|
||||||
./install.sh
|
$(SHELL) install.sh
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
./uninstall.sh
|
$(SHELL) uninstall.sh
|
||||||
|
|
||||||
doc/version.texi: ${srcdest}doc/mes.texi GNUmakefile
|
doc/version.texi: ${srcdest}doc/mes.texi GNUmakefile
|
||||||
@mkdir -p $(@D)
|
@mkdir -p $(@D)
|
||||||
|
|
|
@ -42,10 +42,10 @@ if $courageous; then
|
||||||
set +e
|
set +e
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sh ${srcdest}build-aux/build-scaffold.sh
|
${SHELL} ${srcdest}build-aux/build-scaffold.sh
|
||||||
|
|
||||||
if test -n "$GUILE" -a "$GUILE" != true; then
|
if test -n "$GUILE" -a "$GUILE" != true; then
|
||||||
sh ${srcdest}build-aux/build-guile.sh
|
${SHELL} ${srcdest}build-aux/build-guile.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
debug=
|
debug=
|
||||||
|
@ -101,7 +101,7 @@ if test $compiler = gcc; then
|
||||||
-I ${srcdest}include
|
-I ${srcdest}include
|
||||||
-I ${srcdest}include/$mes_kernel/$mes_cpu
|
-I ${srcdest}include/$mes_kernel/$mes_cpu
|
||||||
"
|
"
|
||||||
sh ${srcdest}build-aux/build-lib.sh
|
${SHELL} ${srcdest}build-aux/build-lib.sh
|
||||||
cp crt1.o ..
|
cp crt1.o ..
|
||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
|
@ -119,7 +119,7 @@ fi
|
||||||
-I ${srcdest}include
|
-I ${srcdest}include
|
||||||
-I ${srcdest}include/$mes_kernel/$mes_cpu
|
-I ${srcdest}include/$mes_kernel/$mes_cpu
|
||||||
"
|
"
|
||||||
sh ${srcdest}build-aux/build-mes.sh
|
${SHELL} ${srcdest}build-aux/build-mes.sh
|
||||||
)
|
)
|
||||||
|
|
||||||
(
|
(
|
||||||
|
@ -143,5 +143,5 @@ fi
|
||||||
compiler=mescc
|
compiler=mescc
|
||||||
AR="${srcdest}pre-inst-env ar"
|
AR="${srcdest}pre-inst-env ar"
|
||||||
CC="${srcdest}pre-inst-env mescc -m $mes_bits"
|
CC="${srcdest}pre-inst-env mescc -m $mes_bits"
|
||||||
sh ${srcdest}build-aux/build-lib.sh
|
${SHELL} ${srcdest}build-aux/build-lib.sh
|
||||||
)
|
)
|
||||||
|
|
|
@ -58,5 +58,5 @@ tests/psyntax.test
|
||||||
XFAIL_TESTS=
|
XFAIL_TESTS=
|
||||||
|
|
||||||
test_ext=.test
|
test_ext=.test
|
||||||
log_compiler=sh
|
log_compiler=${SHELL}
|
||||||
. ${srcdest}build-aux/test-suite.sh
|
. ${srcdest}build-aux/test-suite.sh
|
||||||
|
|
|
@ -269,5 +269,5 @@ fi
|
||||||
|
|
||||||
recheck=${recheck-false}
|
recheck=${recheck-false}
|
||||||
test_ext=.c
|
test_ext=.c
|
||||||
log_compiler=${srcdest}build-aux/test-c.sh
|
log_compiler="${SHELL} ${srcdest}build-aux/test-c.sh"
|
||||||
. ${srcdest}build-aux/test-suite.sh
|
. ${srcdest}build-aux/test-suite.sh
|
||||||
|
|
|
@ -60,15 +60,15 @@ export LDFLAGS
|
||||||
recheck=${recheck-false}
|
recheck=${recheck-false}
|
||||||
export recheck
|
export recheck
|
||||||
|
|
||||||
./pre-inst-env sh ${srcdest}build-aux/check-boot.sh
|
./pre-inst-env ${SHELL} ${srcdest}build-aux/check-boot.sh
|
||||||
./pre-inst-env sh ${srcdest}build-aux/check-mes.sh
|
./pre-inst-env ${SHELL} ${srcdest}build-aux/check-mes.sh
|
||||||
|
|
||||||
if test $compiler = gcc; then
|
if test $compiler = gcc; then
|
||||||
(
|
(
|
||||||
cd gcc-lib
|
cd gcc-lib
|
||||||
srcdest=$srcdir/../
|
srcdest=$srcdir/../
|
||||||
srcdir=../$srcdir
|
srcdir=../$srcdir
|
||||||
../pre-inst-env sh ${srcdest}build-aux/check-mescc.sh
|
../pre-inst-env ${SHELL} ${srcdest}build-aux/check-mescc.sh
|
||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -89,5 +89,5 @@ fi
|
||||||
LIBS=-lc
|
LIBS=-lc
|
||||||
AR="${srcdest}pre-inst-env ar"
|
AR="${srcdest}pre-inst-env ar"
|
||||||
CC="${srcdest}pre-inst-env mescc"
|
CC="${srcdest}pre-inst-env mescc"
|
||||||
../pre-inst-env sh ${srcdest}build-aux/check-mescc.sh
|
../pre-inst-env ${SHELL} ${srcdest}build-aux/check-mescc.sh
|
||||||
)
|
)
|
||||||
|
|
|
@ -41,6 +41,7 @@ PACKAGE:=@PACKAGE@
|
||||||
PACKAGE_NAME:=@PACKAGE_NAME@
|
PACKAGE_NAME:=@PACKAGE_NAME@
|
||||||
PACKAGE_BUGREPORT:=@PACKAGE_BUGREPORT@
|
PACKAGE_BUGREPORT:=@PACKAGE_BUGREPORT@
|
||||||
PERL:=@PERL@
|
PERL:=@PERL@
|
||||||
|
SHELL:=@SHELL@
|
||||||
TINYCC_PREFIX:=@TINYCC_PREFIX@
|
TINYCC_PREFIX:=@TINYCC_PREFIX@
|
||||||
VERSION:=@VERSION@
|
VERSION:=@VERSION@
|
||||||
V:=@V@
|
V:=@V@
|
||||||
|
|
|
@ -41,6 +41,7 @@ PACKAGE="@PACKAGE@"
|
||||||
PACKAGE_NAME="@PACKAGE_NAME@"
|
PACKAGE_NAME="@PACKAGE_NAME@"
|
||||||
PACKAGE_BUGREPORT="@PACKAGE_BUGREPORT@"
|
PACKAGE_BUGREPORT="@PACKAGE_BUGREPORT@"
|
||||||
PERL="@PERL@"
|
PERL="@PERL@"
|
||||||
|
SHELL="@SHELL@"
|
||||||
TINYCC_PREFIX="@TINYCC_PREFIX@"
|
TINYCC_PREFIX="@TINYCC_PREFIX@"
|
||||||
VERSION="@VERSION@"
|
VERSION="@VERSION@"
|
||||||
V=${V-"@V@"}
|
V=${V-"@V@"}
|
||||||
|
@ -86,6 +87,7 @@ export PACKAGE_BUGREPORT
|
||||||
export AR
|
export AR
|
||||||
export CC
|
export CC
|
||||||
export DIFF
|
export DIFF
|
||||||
|
export SHELL
|
||||||
export V
|
export V
|
||||||
export colors
|
export colors
|
||||||
export compiler
|
export compiler
|
||||||
|
|
|
@ -114,6 +114,10 @@ ifdef PERL
|
||||||
export PERL
|
export PERL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef SHELL
|
||||||
|
export SHELL
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef GUILE_LOAD_PATH
|
ifdef GUILE_LOAD_PATH
|
||||||
export GUILE_LOAD_PATH
|
export GUILE_LOAD_PATH
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -44,7 +44,7 @@ for t in $TESTS; do
|
||||||
fail=no;;
|
fail=no;;
|
||||||
esac
|
esac
|
||||||
mkdir -p $d
|
mkdir -p $d
|
||||||
sh ${srcdest}build-aux/test-driver\
|
${SHELL} ${srcdest}build-aux/test-driver\
|
||||||
--test-name $t \
|
--test-name $t \
|
||||||
--log-file $b.log\
|
--log-file $b.log\
|
||||||
--trs-file $b.trs\
|
--trs-file $b.trs\
|
||||||
|
|
4
configure
vendored
4
configure
vendored
|
@ -598,7 +598,9 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
|
||||||
guile))
|
guile))
|
||||||
("@MES_SEED@" . ,(or mes-seed ""))
|
("@MES_SEED@" . ,(or mes-seed ""))
|
||||||
("@PERL@" . ,(or (file-name "perl" deps) ""))
|
("@PERL@" . ,(or (file-name "perl" deps) ""))
|
||||||
("@SHELL@" . ,(or (file-name "sh" deps) ""))
|
("@SHELL@" . ,(or (file-name "bash" deps)
|
||||||
|
(file-name "sh" deps)
|
||||||
|
"sh"))
|
||||||
|
|
||||||
("@CFLAGS@" . ,(or (getenv "CFLAGS") ""))
|
("@CFLAGS@" . ,(or (getenv "CFLAGS") ""))
|
||||||
("@HEX2FLAGS@" . ,(or (getenv "HEX2FLAGS") ""))
|
("@HEX2FLAGS@" . ,(or (getenv "HEX2FLAGS") ""))
|
||||||
|
|
|
@ -106,6 +106,8 @@ M1=${M1-$(command -v M1)}
|
||||||
MES_FOR_BUILD=${MES_FOR_BUILD-$(command -v mes || command -v guile || echo mes)}
|
MES_FOR_BUILD=${MES_FOR_BUILD-$(command -v mes || command -v guile || echo mes)}
|
||||||
GIT=${GIT-$(command -v git)} || true
|
GIT=${GIT-$(command -v git)} || true
|
||||||
PERL=${PERL-$(command -v perl)} || true
|
PERL=${PERL-$(command -v perl)} || true
|
||||||
|
SHELL=${BASH-$SHELL}
|
||||||
|
|
||||||
MES_SEED=${MES_SEED-../mes-seed}
|
MES_SEED=${MES_SEED-../mes-seed}
|
||||||
|
|
||||||
if test "$srcdir" = .; then
|
if test "$srcdir" = .; then
|
||||||
|
|
Loading…
Reference in a new issue