projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable object splitting on OSX; works around #4013
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
299fcb9
..
fadaccd
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-345,6
+345,10
@@
$(eval $(call addPackage,haskeline))
$(foreach pkg,$(EXTRA_PACKAGES),$(eval $(call addPackage,$(pkg))))
ifneq "$(BootingFromHc)" "YES"
$(foreach pkg,$(EXTRA_PACKAGES),$(eval $(call addPackage,$(pkg))))
ifneq "$(BootingFromHc)" "YES"
+
+ifneq "$(GhcProfiled)" "YES"
+# DPH uses Template Haskell, and Template Haskell doesn't work
+# with a profiled compiler. So if stage-2 is profile, don't build DPH
PACKAGES_STAGE2 += \
dph/dph-base \
dph/dph-prim-interface \
PACKAGES_STAGE2 += \
dph/dph-base \
dph/dph-prim-interface \
@@
-353,6
+357,7
@@
PACKAGES_STAGE2 += \
dph/dph-seq \
dph/dph-par
endif
dph/dph-seq \
dph/dph-par
endif
+endif
# We assume that the stage0 compiler has a suitable bytestring package,
# so we don't have to include it below.
# We assume that the stage0 compiler has a suitable bytestring package,
# so we don't have to include it below.
@@
-520,6
+525,7
@@
BUILD_DIRS += \
driver \
driver/ghci \
driver/ghc \
driver \
driver/ghci \
driver/ghc \
+ driver/haddock \
libffi \
includes \
rts
libffi \
includes \
rts
@@
-531,11
+537,9
@@
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 += \