diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-10-27 13:25:15 +0100 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-10-30 17:43:05 +0100 |
| commit | 1f1c7c610b0ff26dccaef089e27003497fa25beb (patch) | |
| tree | c92c19084581b6ade354d1e4dd20661e58f68602 /utils/runghc | |
| parent | 0a16374109ad16d9337185f5c0a845a3f20141cb (diff) | |
| download | haskell-1f1c7c610b0ff26dccaef089e27003497fa25beb.tar.gz | |
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.
Diffstat (limited to 'utils/runghc')
| -rw-r--r-- | utils/runghc/Main.hs (renamed from utils/runghc/runghc.hs) | 0 | ||||
| -rw-r--r-- | utils/runghc/ghc.mk | 6 | ||||
| -rw-r--r-- | utils/runghc/runghc.cabal.in | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/utils/runghc/runghc.hs b/utils/runghc/Main.hs index 42ddb83f25..42ddb83f25 100644 --- a/utils/runghc/runghc.hs +++ b/utils/runghc/Main.hs diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk index 6979d5022b..e981abf9a5 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 fde6b9a4d6..6da179ad24 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, |