Tweak for OBSD and SunOS
Junio C Hamano committed
Jan 6, 2010 at 00:31 UTC
a8516ddd822f22334f1f253ec9eee891726f26ea
2 files changed
+21
-5
Dothem
+11
-3
index 2f6d027fad..3106a30b28 100755
--- a/Dothem
+++ b/Dothem
@@ -147,15 +147,23 @@ do
esac &&
save=$(git rev-parse HEAD) &&
+
{
test "z$with_dash" != 'zy' ||
- Meta/Make $M $test -- $jobs SHELL_PATH=/bin/dash $dotest
+ Meta/Make $M ${test+"$test"} -- $jobs SHELL_PATH=/bin/dash $dotest
} &&
- Meta/Make $M $test -- $jobs $dotest &&
+ Meta/Make $M ${test+"$test"} -- $jobs $dotest &&
+
{
test -n "$nodoc" ||
- Meta/Make $M -- doc install-man install-html
+ if test "$save" = "$(git rev-parse HEAD)"
+ then
+ Meta/Make $M -- $jobs doc &&
+ Meta/Make $M -- install-man install-html
+ else
+ echo >&2 "Head moved--not installing docs"
+ fi
} &&
{
Make
+10
-2
index c6bf6e0d85..3e0c515440 100755
--- a/Make
+++ b/Make
@@ -57,12 +57,16 @@ Wall='-Wall -Wdeclaration-after-statement' tests= jobs=
case `uname` in
OpenBSD)
NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
- Wall= ;;
+ GIT_SKIP_TESTS="t9200 t9502 $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
+ NO_PEDANTIC=CannotDo Wall=
+ ;;
FreeBSD)
OLD_ICONV=YesPlease; export OLD_ICONV
;;
SunOS)
NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
+ GIT_SKIP_TESTS="$GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
+ NO_PEDANTIC=CannotDo Wall=
;;
esac
@@ -76,7 +80,11 @@ do
$old_style_def_fix)
o=-Wold-style-definition ;;
esac
- O="$O -Werror $o -std=c99 -Wno-pointer-to-int-cast"
+ case "$NO_PEDANTIC" in
+ ?*) ;;
+ '')
+ O="$O -Werror $o -std=c99 -Wno-pointer-to-int-cast" ;;
+ esac
# -Wvla
# O="$O -fwrapv -fno-strict-overflow"
;;