[commit: ghc] master: Build system: rename runghc.hs to Main.hs (1f1c7c6)
git at git.haskell.org
git at git.haskell.org
Fri Oct 30 16:46:35 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/1f1c7c610b0ff26dccaef089e27003497fa25beb/ghc
>---------------------------------------------------------------
commit 1f1c7c610b0ff26dccaef089e27003497fa25beb
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date: Tue Oct 27 13:25:15 2015 +0100
Build system: rename runghc.hs to Main.hs
The build system has trouble with Main modules not called Main.hs. This
change allows a hack in utils/runghc/ghc.mk to be removed.
>---------------------------------------------------------------
1f1c7c610b0ff26dccaef089e27003497fa25beb
utils/runghc/{runghc.hs => Main.hs} | 0
utils/runghc/ghc.mk | 6 ------
utils/runghc/runghc.cabal.in | 2 +-
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/utils/runghc/runghc.hs b/utils/runghc/Main.hs
similarity index 100%
rename from utils/runghc/runghc.hs
rename to utils/runghc/Main.hs
diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk
index 6979d50..e981abf 100644
--- a/utils/runghc/ghc.mk
+++ b/utils/runghc/ghc.mk
@@ -27,12 +27,6 @@ define utils/runghc_dist-install_INSTALL_SHELL_WRAPPER_EXTRA
echo 'ghcprog="$(ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_NAME)"' >> "$(WRAPPER)"
endef
-ifneq "$(BINDIST)" "YES"
-# hack: the build system has trouble with Main modules not called Main.hs
-utils/runghc/dist-install/build/Main.hs : utils/runghc/runghc.hs | $$(dir $$@)/.
- "$(CP)" $< $@
-endif
-
$(eval $(call build-prog,utils/runghc,dist-install,1))
install: install_runhaskell
diff --git a/utils/runghc/runghc.cabal.in b/utils/runghc/runghc.cabal.in
index fde6b9a..6da179a 100644
--- a/utils/runghc/runghc.cabal.in
+++ b/utils/runghc/runghc.cabal.in
@@ -17,7 +17,7 @@ Flag base3
Executable runghc
Default-Language: Haskell2010
- Main-Is: runghc.hs
+ Main-Is: Main.hs
if flag(base3)
Build-Depends: base >= 3 && < 5,
More information about the ghc-commits
mailing list