Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
2bdc4fdc
Commit
2bdc4fdc
authored
Mar 03, 2013
by
ian@well-typed.com
Browse files
installation fixes
parent
ddb4879c
Changes
2
Hide whitespace changes
Inline
Side-by-side
ghc.mk
View file @
2bdc4fdc
...
...
@@ -984,7 +984,7 @@ unix-binary-dist-prep:
echo
"BUILD_DOCBOOK_PS =
$(BUILD_DOCBOOK_PS)
"
>>
$(BIN_DIST_MK)
echo
"BUILD_DOCBOOK_PDF =
$(BUILD_DOCBOOK_PDF)
"
>>
$(BIN_DIST_MK)
echo
"BUILD_MAN =
$(BUILD_MAN)
"
>>
$(BIN_DIST_MK)
echo
"ghc-cabal_INPLACE
= utils/ghc-cabal/dist-install/build/tmp/ghc-cabal-bindist"
>>
$(BIN_DIST_MK)
echo
"
override
ghc-cabal_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal-bindist"
>>
$(BIN_DIST_MK)
echo
"UseSystemLibFFI =
$(UseSystemLibFFI)
"
>>
$(BIN_DIST_MK)
cd
$(BIN_DIST_PREP_DIR)
&&
autoreconf
$(
call
removeFiles,
$(BIN_DIST_PREP_TAR)
)
...
...
utils/ghc-cabal/ghc.mk
View file @
2bdc4fdc
...
...
@@ -20,6 +20,7 @@ CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)"
ghc-cabal_INPLACE
=
inplace/bin/ghc-cabal
$(exeext)
ifneq
"$(BINDIST)" "YES"
$(ghc-cabal_INPLACE)
:
utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext) | $$(dir $$@)/.
"
$(CP)
"
$<
$@
...
...
@@ -40,6 +41,7 @@ utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext): utils/ghc-cabal/Main.hs $(TOU
-ilibraries
/hpc
\
$
(
utils/ghc-cabal_dist_EXTRA_HC_OPTS
)
"
$(TOUCH_CMD)
"
$@
endif
# touch is required, because otherwise if mkdirhier is newer, we
# repeatedly rebuild ghc-cabal.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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