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
@@ -147,15 +147,23 @@ do
147
esac &&
148
149
save=$(git rev-parse HEAD) &&
150
+
151
{
152
test "z$with_dash" != 'zy' ||
152
- Meta/Make $M $test -- $jobs SHELL_PATH=/bin/dash $dotest
153
+ Meta/Make $M ${test+"$test"} -- $jobs SHELL_PATH=/bin/dash $dotest
154
} &&
155
155
- Meta/Make $M $test -- $jobs $dotest &&
156
+ Meta/Make $M ${test+"$test"} -- $jobs $dotest &&
157
+
158
{
159
test -n "$nodoc" ||
158
- Meta/Make $M -- doc install-man install-html
160
+ if test "$save" = "$(git rev-parse HEAD)"
161
+ then
162
+ Meta/Make $M -- $jobs doc &&
163
+ Meta/Make $M -- install-man install-html
164
+ else
165
+ echo >&2 "Head moved--not installing docs"
166
+ fi
167
} &&
168
169
{
Make
+10
-2
@@ -57,12 +57,16 @@ Wall='-Wall -Wdeclaration-after-statement' tests= jobs=
57
case `uname` in
58
OpenBSD)
59
NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
60
- Wall= ;;
60
+ GIT_SKIP_TESTS="t9200 t9502 $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
61
+ NO_PEDANTIC=CannotDo Wall=
62
+ ;;
63
FreeBSD)
64
OLD_ICONV=YesPlease; export OLD_ICONV
65
;;
66
SunOS)
67
NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
68
+ GIT_SKIP_TESTS="$GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
69
+ NO_PEDANTIC=CannotDo Wall=
70
;;
71
esac
72
@@ -76,7 +80,11 @@ do
80
$old_style_def_fix)
81
o=-Wold-style-definition ;;
82
esac
79
- O="$O -Werror $o -std=c99 -Wno-pointer-to-int-cast"
83
+ case "$NO_PEDANTIC" in
84
+ ?*) ;;
85
+ '')
86
+ O="$O -Werror $o -std=c99 -Wno-pointer-to-int-cast" ;;
87
+ esac
88
# -Wvla
89
# O="$O -fwrapv -fno-strict-overflow"
90
;;