projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New syntax for GADT-style record declarations, and associated refactoring
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
d6a5094
..
84c3774
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-202,6
+202,7
@@
include rules/c-sources.mk
include rules/includes-sources.mk
include rules/hs-objs.mk
include rules/c-objs.mk
include rules/includes-sources.mk
include rules/hs-objs.mk
include rules/c-objs.mk
+include rules/cmm-objs.mk
# -----------------------------------------------------------------------------
# Suffix rules
# -----------------------------------------------------------------------------
# Suffix rules
@@
-226,6
+227,11
@@
$(foreach way,$(ALL_WAYS),\
include rules/c-suffix-rules.mk
include rules/c-suffix-rules.mk
+#-----------------------------------------------------------------------------
+# CMM-related suffix rules
+
+include rules/cmm-suffix-rules.mk
+
endif
# -----------------------------------------------------------------------------
endif
# -----------------------------------------------------------------------------
@@
-283,6
+289,7
@@
include rules/bindist.mk
PACKAGES = \
ghc-prim \
integer-gmp \
PACKAGES = \
ghc-prim \
integer-gmp \
+ integer \
base \
filepath \
array \
base \
filepath \
array \
@@
-304,7
+311,6
@@
PACKAGES += \
extensible-exceptions \
haskell98 \
hpc \
extensible-exceptions \
haskell98 \
hpc \
- packedstring \
pretty \
syb \
template-haskell \
pretty \
syb \
template-haskell \
@@
-342,10
+348,6
@@
OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o
ifeq "$(BuildSharedLibs)" "YES"
OTHER_LIBS += libffi/libHSffi$(dyn_libsuf)
endif
ifeq "$(BuildSharedLibs)" "YES"
OTHER_LIBS += libffi/libHSffi$(dyn_libsuf)
endif
-ifeq "$(HaveLibGmp)" "NO"
-GMP_LIB = gmp/libgmp.a
-OTHER_LIBS += $(GMP_LIB)
-endif
# We cannot run ghc-cabal to configure a package until we have
# configured and registered all of its dependencies. So the following
# We cannot run ghc-cabal to configure a package until we have
# configured and registered all of its dependencies. So the following
@@
-456,7
+458,6
@@
BUILD_DIRS += \
endif
BUILD_DIRS += \
endif
BUILD_DIRS += \
- gmp \
docs/users_guide \
libraries/Cabal/doc \
$(GHC_UNLIT_DIR) \
docs/users_guide \
libraries/Cabal/doc \
$(GHC_UNLIT_DIR) \
@@
-501,6
+502,7
@@
endif
endif
BUILD_DIRS += \
endif
BUILD_DIRS += \
+ libraries/integer-gmp/gmp \
compiler \
$(GHC_HSC2HS_DIR) \
$(GHC_PKG_DIR) \
compiler \
$(GHC_HSC2HS_DIR) \
$(GHC_PKG_DIR) \
@@
-564,6
+566,10
@@
$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS +=
# out the ones it thinks aren't supported.
libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports
# out the ones it thinks aren't supported.
libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports
+# A useful pseudo-target
+.PHONY: stage1_libs
+stage1_libs : $(ALL_STAGE1_LIBS)
+
# -----------------------------------------------------------------------------
# Bootstrapping libraries
# -----------------------------------------------------------------------------
# Bootstrapping libraries
@@
-760,7
+766,7
@@
$(eval $(call bindist,.,\
binary-dist:
"$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME)
mkdir $(BIN_DIST_NAME)
binary-dist:
"$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME)
mkdir $(BIN_DIST_NAME)
- set -e; for i in LICENSE compiler ghc rts libraries utils gmp docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done
+ set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done
ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac
cd $(BIN_DIST_NAME) && autoreconf
"$(RM)" $(RM_OPTS) $(BIN_DIST_TAR)
ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac
cd $(BIN_DIST_NAME) && autoreconf
"$(RM)" $(RM_OPTS) $(BIN_DIST_TAR)
@@
-813,11
+819,12
@@
SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
#
# Files to include in source distributions
#
#
# Files to include in source distributions
#
-SRC_DIST_DIRS = mk rules docs distrib bindisttest gmp libffi includes utils docs rts compiler ghc driver libraries
+SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries
SRC_DIST_FILES += \
configure.ac config.guess config.sub configure \
aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
SRC_DIST_FILES += \
configure.ac config.guess config.sub configure \
aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
- ghc.spec.in ghc.spec extra-gcc-opts.in VERSION boot ghc.mk
+ ghc.spec.in ghc.spec extra-gcc-opts.in VERSION \
+ boot boot-pkgs packages ghc.mk
SRC_DIST_TARBALL = $(SRC_DIST_NAME)-src.tar.bz2
SRC_DIST_TARBALL = $(SRC_DIST_NAME)-src.tar.bz2
@@
-945,3
+952,5
@@
bootstrapping-files: includes/ghcautoconf.h
bootstrapping-files: includes/DerivedConstants.h
bootstrapping-files: includes/GHCConstants.h
bootstrapping-files: includes/DerivedConstants.h
bootstrapping-files: includes/GHCConstants.h
+.DELETE_ON_ERROR:
+