projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
emitRetUT: cope with arguments overlapping with results (#3546)
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
5952bee
..
7541a87
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-317,7
+317,6
@@
$(eval $(call addPackage,extensible-exceptions))
$(eval $(call addPackage,haskell98))
$(eval $(call addPackage,hpc))
$(eval $(call addPackage,pretty))
$(eval $(call addPackage,haskell98))
$(eval $(call addPackage,hpc))
$(eval $(call addPackage,pretty))
-$(eval $(call addPackage,syb))
$(eval $(call addPackage,template-haskell))
$(eval $(call addPackage,Cabal))
$(eval $(call addPackage,binary))
$(eval $(call addPackage,template-haskell))
$(eval $(call addPackage,Cabal))
$(eval $(call addPackage,binary))
@@
-494,9
+493,11
@@
BUILD_DIRS += \
$(GHC_GENAPPLY_DIR)
endif
$(GHC_GENAPPLY_DIR)
endif
+ifneq "$(HADDOCK_DOCS)" "NO"
BUILD_DIRS += \
utils/haddock \
utils/haddock/doc
BUILD_DIRS += \
utils/haddock \
utils/haddock/doc
+endif
ifneq "$(CLEANING)" "YES"
BUILD_DIRS += \
ifneq "$(CLEANING)" "YES"
BUILD_DIRS += \
@@
-807,13
+808,15
@@
install_packages: libffi/package.conf.install rts/package.conf.install
$(INSTALLED_GHC_PKG_REAL) \
$(DESTDIR)$(topdir) \
libraries/$p dist-install \
$(INSTALLED_GHC_PKG_REAL) \
$(DESTDIR)$(topdir) \
libraries/$p dist-install \
- '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' &&) true
+ '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
+ $(RelocatableBuild) &&) true
"$(GHC_CABAL_INPLACE)" install \
$(INSTALLED_GHC_REAL) \
$(INSTALLED_GHC_PKG_REAL) \
$(DESTDIR)$(topdir) \
compiler stage2 \
"$(GHC_CABAL_INPLACE)" install \
$(INSTALLED_GHC_REAL) \
$(INSTALLED_GHC_PKG_REAL) \
$(DESTDIR)$(topdir) \
compiler stage2 \
- '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries'
+ '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
+ $(RelocatableBuild)
# -----------------------------------------------------------------------------
# Binary distributions
# -----------------------------------------------------------------------------
# Binary distributions