[commit: packages/directory] master: Remove patch in tools/ghc.patch (fixed upstream) (3d83d75)

git at git.haskell.org git at git.haskell.org
Fri Dec 18 09:50:06 UTC 2015


Repository : ssh://git@git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3d83d7554794ac5ba6b921e4876429dc1ed77144/directory

>---------------------------------------------------------------

commit 3d83d7554794ac5ba6b921e4876429dc1ed77144
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun Apr 5 03:20:52 2015 -0400

    Remove patch in tools/ghc.patch (fixed upstream)


>---------------------------------------------------------------

3d83d7554794ac5ba6b921e4876429dc1ed77144
 tools/ghc.patch | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/tools/ghc.patch b/tools/ghc.patch
index 61ce567..db2be18 100644
--- a/tools/ghc.patch
+++ b/tools/ghc.patch
@@ -1,51 +1,3 @@
-# allow ghc and its tools to be located in different directories
---- testsuite/mk/boilerplate.mk
-+++ testsuite/mk/boilerplate.mk
-@@ -56,6 +56,7 @@ TEST_HC := $(STAGE2_GHC)
- endif
- 
- else
-+implicit_compiler = YES
- IN_TREE_COMPILER = NO
- TEST_HC := $(shell which ghc)
- endif
-@@ -87,24 +88,30 @@ endif
- # containing spaces
- BIN_ROOT = $(shell dirname '$(TEST_HC)')
- 
-+ifeq "$(implicit_compiler)" "YES"
-+find_tool = $(shell which $(1))
-+else
-+find_tool = $(BIN_ROOT)/$(1)
-+endif
-+
- ifeq "$(GHC_PKG)" ""
--GHC_PKG := $(BIN_ROOT)/ghc-pkg
-+GHC_PKG := $(call find_tool,ghc-pkg)
- endif
- 
- ifeq "$(RUNGHC)" ""
--RUNGHC := $(BIN_ROOT)/runghc
-+RUNGHC := $(call find_tool,runghc)
- endif
- 
- ifeq "$(HSC2HS)" ""
--HSC2HS := $(BIN_ROOT)/hsc2hs
-+HSC2HS := $(call find_tool,hsc2hs)
- endif
- 
- ifeq "$(HP2PS_ABS)" ""
--HP2PS_ABS := $(BIN_ROOT)/hp2ps
-+HP2PS_ABS := $(call find_tool,hp2ps)
- endif
- 
- ifeq "$(HPC)" ""
--HPC := $(BIN_ROOT)/hpc
-+HPC := $(call find_tool,hpc)
- endif
- 
- $(eval $(call canonicaliseExecutable,TEST_HC))
-
 # 'die' is not available until GHC 7.10
 --- testsuite/timeout/timeout.hs
 +++ testsuite/timeout/timeout.hs



More information about the ghc-commits mailing list