projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't overwrite the *OPTS/*Opts variables in mk/validate-settings.mk
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
f77f9eb
..
c6e0b58
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-51,9
+51,7
@@
#
# Tickets we can now close, or fix and close:
#
#
# Tickets we can now close, or fix and close:
#
-# * 2966 make sure --with-gcc does the right thing (#2966)
# * 1693 make distclean
# * 1693 make distclean
-# * 2689 make maintainer-clean
# * 3173 make install with DESTDIR
# Possible cleanups:
# * 3173 make install with DESTDIR
# Possible cleanups:
@@
-134,6
+132,8
@@
show:
# -----------------------------------------------------------------------------
# Include subsidiary build-system bits
# -----------------------------------------------------------------------------
# Include subsidiary build-system bits
+include mk/tree.mk
+
ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
include mk/config.mk
ifeq "$(ProjectVersion)" ""
ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
include mk/config.mk
ifeq "$(ProjectVersion)" ""
@@
-171,6
+171,10
@@
ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
NO_INCLUDE_DEPS = YES
NO_INCLUDE_PKGDATA = YES
endif
NO_INCLUDE_DEPS = YES
NO_INCLUDE_PKGDATA = YES
endif
+ifneq "$(findstring bootstrapping-files,$(MAKECMDGOALS))" ""
+NO_INCLUDE_DEPS = YES
+NO_INCLUDE_PKGDATA = YES
+endif
ifeq "$(findstring show,$(MAKECMDGOALS))" "show"
NO_INCLUDE_DEPS = YES
# We want package-data.mk for show
ifeq "$(findstring show,$(MAKECMDGOALS))" "show"
NO_INCLUDE_DEPS = YES
# We want package-data.mk for show
@@
-211,6
+215,10
@@
include rules/c-objs.mk
# -----------------------------------------------------------------------------
# Suffix rules
# -----------------------------------------------------------------------------
# Suffix rules
+# Suffix rules cause "make clean" to fail on Windows (trac #3233)
+# so we don't make any when cleaning.
+ifneq "$(CLEANING)" "YES"
+
include rules/hs-suffix-rules-srcdir.mk
include rules/hs-suffix-rules.mk
include rules/hs-suffix-rules-srcdir.mk
include rules/hs-suffix-rules.mk
@@
-227,6
+235,8
@@
$(foreach way,$(ALL_WAYS),\
include rules/c-suffix-rules.mk
include rules/c-suffix-rules.mk
+endif
+
# -----------------------------------------------------------------------------
# Building package-data.mk files from .cabal files
# -----------------------------------------------------------------------------
# Building package-data.mk files from .cabal files
@@
-318,6
+328,7
@@
endif
PACKAGES += haskeline
PACKAGES += haskeline
+ifneq "$(BootingFromHc)" "YES"
PACKAGES_STAGE2 += \
dph/dph-base \
dph/dph-prim-interface \
PACKAGES_STAGE2 += \
dph/dph-base \
dph/dph-prim-interface \
@@
-325,6
+336,7
@@
PACKAGES_STAGE2 += \
dph/dph-prim-par \
dph/dph-seq \
dph/dph-par
dph/dph-prim-par \
dph/dph-seq \
dph/dph-par
+endif
BOOT_PKGS = Cabal hpc extensible-exceptions
BOOT_PKGS = Cabal hpc extensible-exceptions
@@
-340,7
+352,8
@@
ifeq "$(BuildSharedLibs)" "YES"
OTHER_LIBS += libffi/libHSffi$(dyn_libsuf)
endif
ifeq "$(HaveLibGmp)" "NO"
OTHER_LIBS += libffi/libHSffi$(dyn_libsuf)
endif
ifeq "$(HaveLibGmp)" "NO"
-OTHER_LIBS += gmp/libgmp.a
+GMP_LIB = gmp/libgmp.a
+OTHER_LIBS += $(GMP_LIB)
endif
# We cannot run ghc-cabal to configure a package until we have
endif
# We cannot run ghc-cabal to configure a package until we have
@@
-485,9
+498,12
@@
BUILD_DIRS += \
ifneq "$(CLEANING)" "YES"
BUILD_DIRS += \
ifneq "$(CLEANING)" "YES"
BUILD_DIRS += \
- $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2)) \
+ $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2))
+ifneq "$(BootingFromHc)" "YES"
+BUILD_DIRS += \
libraries/dph
endif
libraries/dph
endif
+endif
BUILD_DIRS += \
compiler \
BUILD_DIRS += \
compiler \
@@
-547,7
+563,7
@@
$(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-instal
# XXX Hack; remove this
$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn))
# XXX Hack; remove this
$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn))
-# XXX we configure packages with the bootsrapping compiler (for
+# XXX we configure packages with the bootstrapping compiler (for
# dependency reasons, see the phase ordering), which doesn't
# necessarily support all the extensions we need, and Cabal filters
# out the ones it thinks aren't supported.
# dependency reasons, see the phase ordering), which doesn't
# necessarily support all the extensions we need, and Cabal filters
# out the ones it thinks aren't supported.
@@
-741,6
+757,7
@@
$(eval $(call bindist,.,\
$(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \
mk/fix_install_names.sh \
mk/project.mk \
$(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \
mk/fix_install_names.sh \
mk/project.mk \
+ libraries/dph/LICENSE \
))
# mk/project.mk gets an absolute path, so we manually include it in
# the bindist with a relative path
))
# mk/project.mk gets an absolute path, so we manually include it in
# the bindist with a relative path
@@
-857,7
+874,7
@@
publish-sdist :
endif
ifeq "$(GhcUnregisterised)" "YES"
endif
ifeq "$(GhcUnregisterised)" "YES"
-SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
+SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
endif
# -----------------------------------------------------------------------------
endif
# -----------------------------------------------------------------------------
@@
-910,3
+927,9
@@
maintainer-clean : distclean
.PHONY: all_libraries
.PHONY: all_libraries
+.PHONY: bootstrapping-files
+bootstrapping-files: $(OTHER_LIBS)
+bootstrapping-files: includes/ghcautoconf.h
+bootstrapping-files: includes/DerivedConstants.h
+bootstrapping-files: includes/GHCConstants.h
+