From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 3 Jan 2012 16:46:02 +0000 (-0500)
Subject: Update the cabal file for ghc-7.4.
X-Git-Tag: 0.0.1~55
X-Git-Url: http://gitweb.michael.orlitzky.com/?p=spline3.git;a=commitdiff_plain;h=69389e0a95ce3b47a82d6c650d4fc9ca3cd95483

Update the cabal file for ghc-7.4.
---

diff --git a/spline3.cabal b/spline3.cabal
index 4912de0..df7697d 100644
--- a/spline3.cabal
+++ b/spline3.cabal
@@ -18,7 +18,7 @@ flag LLVM
 
 executable spline3
   build-depends:
-    base                        == 4.4.*,
+    base                        == 4.5.*,
     filepath                    == 1.*,
     HUnit                       == 1.2.*,
     QuickCheck                  == 2.4.*,
@@ -60,17 +60,13 @@ executable spline3
       -optlc-O3
   else
     ghc-options:
+      -O2
       -optc-O3
       -optc-march=native
 
-  -- GHC's -O2 and -fhpc don't get along too well at the moment.
-  -- Note: this relies on the LLVM/HPC flags being mutually-exclusive.
   if flag(hpc)
     ghc-options:
       -fhpc
-  else
-    ghc-options:
-      -O2
 
   ghc-prof-options:
     -prof