Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
bcd95f91
Commit
bcd95f91
authored
Oct 24, 2007
by
Ian Lynagh
Browse files
Fix ghc package in bindists; it wasn't adding the depenedency on readline
parent
a214945e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
bcd95f91
...
...
@@ -330,6 +330,7 @@ binary-dist::
echo
"GhcHasReadline =
$(GhcHasReadline)
"
>>
$(VARFILE)
echo
"BootingFromHc =
$(BootingFromHc)
"
>>
$(VARFILE)
echo
"XMLDocWays =
$(XMLDocWays)
"
>>
$(VARFILE)
echo
"TARGETPLATFORM =
$(TARGETPLATFORM)
"
>>
$(VARFILE)
cat
distrib/Makefile-bin-vars.in
>>
$(VARFILE)
@
echo
"Generating a shippable configure script.."
$(MV)
$(BIN_DIST_DIR)
/configure-bin.ac
$(BIN_DIST_DIR)
/configure.ac
...
...
compiler/Makefile
View file @
bcd95f91
...
...
@@ -493,7 +493,7 @@ SRC_HC_OPTS += -package readline -DUSE_READLINE
PKG_DEPENDS
+=
readline
endif
else
-include
$(FPTOOLS_TOP)/libraries/readline/config.mk
-include
$(FPTOOLS_TOP
_ABS
)/libraries/readline/config.mk
# readline's config.mk sets PACKAGE, which we don't want here
PACKAGE
=
ifeq
"$(READLINE_BUILD_PACKAGE)" "yes"
...
...
libraries/Makefile
View file @
bcd95f91
...
...
@@ -368,6 +368,10 @@ ifeq "$(HADDOCK_DOCS)" "YES"
cp
doc-index
*
.html
$(BIN_DIST_LIBDIR)
endif
cp
-pR
stamp
$(BIN_DIST_LIBDIR)
# This gets used in the compiler directory to see if GHC should
# depend on the readline package or not
$(MKDIRHIER)
$(BIN_DIST_LIBDIR)
/readline
cp
readline/config.mk
$(BIN_DIST_LIBDIR)
/readline
$(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
:
\
binary-dist.library.%:
...
...
Write
Preview
Markdown
is supported
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