projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak ./boot
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
76b9748
..
690850d
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-33,7
+33,6
@@
# * remove old Makefiles, add new stubs for building in subdirs
# * utils/hsc2hs/Makefile
# * utils/haddock/Makefile
# * remove old Makefiles, add new stubs for building in subdirs
# * utils/hsc2hs/Makefile
# * utils/haddock/Makefile
-# * mk/oldconfig.mk.in
# * docs/Makefile
# * docs/docbook-cheat-sheet/Makefile
# * docs/ext-core/Makefile
# * docs/Makefile
# * docs/docbook-cheat-sheet/Makefile
# * docs/ext-core/Makefile
@@
-716,13
+715,13
@@
install_packages: libffi/package.conf.install rts/package.conf.install
$(eval $(call bindist,.,\
LICENSE \
$(eval $(call bindist,.,\
LICENSE \
- configure config.sub config.guess \
+ configure config.sub config.guess install-sh \
extra-gcc-opts.in \
Makefile \
mk/config.mk.in \
$(INPLACE_BIN)/mkdirhier \
$(INPLACE_BIN)/ghc-cabal \
extra-gcc-opts.in \
Makefile \
mk/config.mk.in \
$(INPLACE_BIN)/mkdirhier \
$(INPLACE_BIN)/ghc-cabal \
- utils/pwd/pwd \
+ utils/ghc-pwd/ghc-pwd \
$(BINDIST_WRAPPERS) \
$(BINDIST_LIBS) \
$(BINDIST_HI) \
$(BINDIST_WRAPPERS) \
$(BINDIST_LIBS) \
$(BINDIST_HI) \
@@
-742,7
+741,7
@@
$(eval $(call bindist,.,\
binary-dist:
$(RM) -rf $(BIN_DIST_NAME)
mkdir $(BIN_DIST_NAME)
binary-dist:
$(RM) -rf $(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 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 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
ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac
cd $(BIN_DIST_NAME) && autoreconf
$(RM) -f $(BIN_DIST_TAR)
ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac
cd $(BIN_DIST_NAME) && autoreconf
$(RM) -f $(BIN_DIST_TAR)
@@
-856,11
+855,20
@@
publish-sdist :
$(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
endif
$(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
endif
+ifeq "$(GhcUnregisterised)" "YES"
+SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
+endif
+
# -----------------------------------------------------------------------------
# Cleaning
.PHONY: clean
# -----------------------------------------------------------------------------
# Cleaning
.PHONY: clean
+CLEAN_FILES += utils/ghc-pwd/ghc-pwd
+CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe
+CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi
+CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o
+
clean : clean_files
.PHONY: clean_files
clean_files :
clean : clean_files
.PHONY: clean_files
clean_files :