X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-ghc.git;a=blobdiff_plain;f=patches%2Fpatch-rules_hs-suffix-rules-srcdir.mk;fp=patches%2Fpatch-aj;h=818b8798e1fe424e3099b994135576c1085f79bf;hp=5e045dbc76b201bbaf31dc48559b15985b5a4587;hb=9795cf147d263fd5fad5d40948bc965e9219dd64;hpb=f4afb39c623b1c077a5ffeddbad2b4f451f0d975

diff --git a/patches/patch-aj b/patches/patch-rules_hs-suffix-rules-srcdir.mk
similarity index 51%
rename from patches/patch-aj
rename to patches/patch-rules_hs-suffix-rules-srcdir.mk
index 5e045db..818b879 100644
--- a/patches/patch-aj
+++ b/patches/patch-rules_hs-suffix-rules-srcdir.mk
@@ -1,13 +1,17 @@
 $NetBSD$
 
---- rules/hs-suffix-rules-srcdir.mk.orig	2011-03-26 18:10:07.000000000 +0000
+There is a missing ".hc -> .o" rule in this file, leading to a build
+failure of Cabal.
+
+
+--- rules/hs-suffix-rules-srcdir.mk.orig	2012-02-01 18:10:32.000000000 +0000
 +++ rules/hs-suffix-rules-srcdir.mk
-@@ -55,6 +55,9 @@ $1/$2/build/%.$$($3_osuf) : $1/$4/%.hc i
+@@ -57,6 +57,9 @@ $1/$2/build/%.$$($3_osuf) : $1/$4/%.hc i
  $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc includes/ghcautoconf.h includes/ghcplatform.h
- 	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
+ 	"$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
  
 +$1/$2/build/%.$$($3_osuf) : $1/$2/build/autogen/%.hc includes/ghcautoconf.h includes/ghcplatform.h
-+	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
++	"$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
 +
  # $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)hc
  # 	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@