Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
GHC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jberryman
GHC
Commits
bcd95f91
Commit
bcd95f91
authored
Oct 24, 2007
by
Ian Lynagh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ghc package in bindists; it wasn't adding the depenedency on readline
parent
a214945e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
Makefile
Makefile
+1
-0
compiler/Makefile
compiler/Makefile
+1
-1
libraries/Makefile
libraries/Makefile
+4
-0
No files found.
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