projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the thr_dyn RTS ways optional on GhcUnregisterised
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
56af0ee
..
f87ccb1
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-697,7
+697,8
@@
libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \
# Installation
install: install_packages install_libs install_libexecs install_headers \
# Installation
install: install_packages install_libs install_libexecs install_headers \
- install_libexec_scripts install_bins install_docs install_topdirs
+ install_libexec_scripts install_bins install_docs \
+ install_topdirs install_topdir_scripts
install_bins: $(INSTALL_BINS)
$(INSTALL_DIR) $(DESTDIR)$(bindir)
install_bins: $(INSTALL_BINS)
$(INSTALL_DIR) $(DESTDIR)$(bindir)
@@
-739,6
+740,12
@@
install_libexecs: $(INSTALL_LIBEXECS)
$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \
done
$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \
done
+install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS)
+ $(INSTALL_DIR) $(DESTDIR)$(topdir)
+ for i in $(INSTALL_TOPDIR_SCRIPTS); do \
+ $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(topdir); \
+ done
+
install_topdirs: $(INSTALL_TOPDIRS)
$(INSTALL_DIR) $(DESTDIR)$(topdir)
for i in $(INSTALL_TOPDIRS); do \
install_topdirs: $(INSTALL_TOPDIRS)
$(INSTALL_DIR) $(DESTDIR)$(topdir)
for i in $(INSTALL_TOPDIRS); do \
@@
-817,6
+824,7
@@
$(eval $(call bindist,root1,\
$(INSTALL_LIBEXECS) \
$(INSTALL_LIBEXEC_SCRIPTS) \
$(INSTALL_TOPDIRS) \
$(INSTALL_LIBEXECS) \
$(INSTALL_LIBEXEC_SCRIPTS) \
$(INSTALL_TOPDIRS) \
+ $(INSTALL_TOPDIR_SCRIPTS) \
$(INSTALL_BINS) \
$(INSTALL_DOCS) \
$(INSTALL_LIBRARY_DOCS) \
$(INSTALL_BINS) \
$(INSTALL_DOCS) \
$(INSTALL_LIBRARY_DOCS) \
@@
-970,7
+978,7
@@
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"
+ifeq "$(BootingFromUnregisterisedHc)" "YES"
SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
endif
SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
endif