somehow magically make it seem to work
This commit is contained in:
parent
7081a38796
commit
a592c65cf0
34
Build.sh
34
Build.sh
@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.284 2008/03/05 17:30:10 tg Exp $'
|
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.285 2008/03/05 17:52:43 tg Exp $'
|
||||||
#-
|
#-
|
||||||
# Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF TARGET_OS
|
# Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF TARGET_OS
|
||||||
# CPPFLAGS recognised: MKSH_SMALL MKSH_ASSUME_UTF8 MKSH_NOPWNAM MKSH_NOVI
|
# CPPFLAGS recognised: MKSH_SMALL MKSH_ASSUME_UTF8 MKSH_NOPWNAM MKSH_NOVI
|
||||||
@ -121,10 +121,9 @@ ac_testn() {
|
|||||||
fi
|
fi
|
||||||
ac_testinit "$@" || return
|
ac_testinit "$@" || return
|
||||||
cat >scn.c
|
cat >scn.c
|
||||||
vv ']' "$CC $CFLAGS $CPPFLAGS $LDFLAGS $NOWARN scn.c $LIBS"
|
vv ']' "$CC $CFLAGS $CPPFLAGS $LDFLAGS $NOWARN scn.c $LIBS $ccpr"
|
||||||
rv=$?; test $ct = msc || test 0 = $rv || rm -f a.out a.exe
|
test $tcfn = no && test -f a.out && tcfn=a.out
|
||||||
test x"$tcfn" = x"no" && test -f a.out && tcfn=a.out
|
test $tcfn = no && test -f a.exe && tcfn=a.exe
|
||||||
test x"$tcfn" = x"no" && test -f a.exe && tcfn=a.exe
|
|
||||||
if test -f $tcfn; then
|
if test -f $tcfn; then
|
||||||
test 1 = $fr || fv=1
|
test 1 = $fr || fv=1
|
||||||
else
|
else
|
||||||
@ -258,6 +257,7 @@ warn=
|
|||||||
ccpc=-Wc,
|
ccpc=-Wc,
|
||||||
ccpl=-Wl,
|
ccpl=-Wl,
|
||||||
tsts=
|
tsts=
|
||||||
|
ccpr='|| rm -f $tcfn'
|
||||||
case $TARGET_OS in
|
case $TARGET_OS in
|
||||||
AIX)
|
AIX)
|
||||||
if test x"$LDFLAGS" = x""; then
|
if test x"$LDFLAGS" = x""; then
|
||||||
@ -429,6 +429,7 @@ hpcc|icc)
|
|||||||
vv '|' "$CC -V"
|
vv '|' "$CC -V"
|
||||||
;;
|
;;
|
||||||
msc)
|
msc)
|
||||||
|
ccpr=
|
||||||
;;
|
;;
|
||||||
pcc|sunpro|tcc)
|
pcc|sunpro|tcc)
|
||||||
vv '|' "$CC -v"
|
vv '|' "$CC -v"
|
||||||
@ -1069,10 +1070,12 @@ for file in $SRCS; do
|
|||||||
test -f $file || file=$srcdir/$file
|
test -f $file || file=$srcdir/$file
|
||||||
echo "$CC $CFLAGS $CPPFLAGS -c $file || exit 1" >>Rebuild.sh
|
echo "$CC $CFLAGS $CPPFLAGS -c $file || exit 1" >>Rebuild.sh
|
||||||
done
|
done
|
||||||
echo "$CC $CFLAGS $LDFLAGS -o mksh $objs $LIBS" >>Rebuild.sh
|
case $tcfn in
|
||||||
test $ct = msc || echo 'test 0 = $? || exit 1' >>Rebuild.sh
|
a.exe) echo tcfn=mksh.exe >>Rebuild.sh ;;
|
||||||
echo 'result=mksh; test -f mksh.exe && result=mksh.exe' >>Rebuild.sh
|
*) echo tcfn=mksh >>Rebuild.sh ;;
|
||||||
echo 'test -f $result || exit 1; size $result' >>Rebuild.sh
|
esac
|
||||||
|
echo "$CC $CFLAGS $LDFLAGS -o \$tcfn $objs $LIBS $ccpr" >>Rebuild.sh
|
||||||
|
echo 'test -f \$tcfn || exit 1; size \$tcfn' >>Rebuild.sh
|
||||||
if test 1 = $pm; then
|
if test 1 = $pm; then
|
||||||
for file in $SRCS; do
|
for file in $SRCS; do
|
||||||
test -f $file || file=$srcdir/$file
|
test -f $file || file=$srcdir/$file
|
||||||
@ -1085,14 +1088,15 @@ else
|
|||||||
v "$CC $CFLAGS $CPPFLAGS -c $file" || exit 1
|
v "$CC $CFLAGS $CPPFLAGS -c $file" || exit 1
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
v "$CC $CFLAGS $LDFLAGS -o mksh $objs $LIBS"
|
case $tcfn in
|
||||||
rv=$?; test $ct = msc || test 0 = $rv || exit 1
|
a.exe) tcfn=mksh.exe ;;
|
||||||
result=mksh
|
*) tcfn=mksh ;;
|
||||||
test -f mksh.exe && result=mksh.exe
|
esac
|
||||||
test -f $result || exit 1
|
v "$CC $CFLAGS $LDFLAGS -o $tcfn $objs $LIBS $ccpr"
|
||||||
|
test -f $ccpr || exit 1
|
||||||
test 1 = $r || v "$NROFF -mdoc <'$srcdir/mksh.1' >mksh.cat1" || \
|
test 1 = $r || v "$NROFF -mdoc <'$srcdir/mksh.1' >mksh.cat1" || \
|
||||||
rm -f mksh.cat1
|
rm -f mksh.cat1
|
||||||
test 0 = $eq && test 1 = $h && v size $result
|
test 0 = $eq && test 1 = $h && v size $tcfn
|
||||||
i=install
|
i=install
|
||||||
test -f /usr/ucb/$i && i=/usr/ucb/$i
|
test -f /usr/ucb/$i && i=/usr/ucb/$i
|
||||||
test 1 = $eq && e=:
|
test 1 = $eq && e=:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user