Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
jberryman
GHC
Commits
5c103922
Commit
5c103922
authored
Sep 05, 2008
by
Ian Lynagh
Browse files
Remove the haddock detection
Now that we build haddock in the GHC build, we don't need to look for it on the path.
parent
d1876c6a
Changes
3
Hide whitespace changes
Inline
Side-by-side
aclocal.m4
View file @
5c103922
...
...
@@ -253,27 +253,6 @@ HappyVersion=$fptools_cv_happy_version;
AC_SUBST(HappyVersion)
])
dnl
dnl Check for Haddock and version. If there's no installed Haddock, we look
dnl for a haddock source tree and point the build system at that instead.
dnl
AC_DEFUN([FPTOOLS_HADDOCK],
[AC_PATH_PROG(HaddockCmd,haddock,)
dnl Darn, I forgot to make Haddock print out its version number when
dnl invoked with -v. We could try generating some HTML and grepping
dnl through that to find the version number, but I think we'll make
dnl do without it for now.
# Haddock is passed to Cabal, so we need a native path
if test "x$HostPlatform" = "xi386-unknown-mingw32" && \
test "${OSTYPE}" != "msys" && \
test "${HaddockCmd}" != ""
then
# Canonicalise to <drive>:/path/to/gcc
HaddockCmd=`cygpath -m ${HaddockCmd}`
AC_MSG_NOTICE([normalized haddock command to $HaddockCmd])
fi
])
dnl
dnl Check for Alex and version. If we're building GHC, then we need
dnl at least Alex version 2.0.1.
...
...
mk/config.mk.in
View file @
5c103922
...
...
@@ -1185,11 +1185,6 @@ ALEX_VERSION = @AlexVersion@
#
GHC_ALEX_OPTS
=
-g
#
# Haddock
#
HADDOCK
=
@HaddockCmd@
#
# Options for compiling in different `ways'.
#
...
...
mk/package.mk
View file @
5c103922
...
...
@@ -270,13 +270,6 @@ ifneq "$(HS_PPS)" ""
CLEAN_FILES
+=
$(HS_PPS)
$(
addsuffix
.tmp,
$(HS_SRCS)
)
ifeq
"$(HADDOCK)" ""
html
::
@
echo
Haddock must be installed
in
order to build HTML library documentation.
@
echo
Please
install
Haddock and re-configure.
@
exit
1
endif
html
::
$(HTML_DOC)
extraclean
::
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment