From bbbbd18cd4e3b7d07decc16814910f19e3ce8913 Mon Sep 17 00:00:00 2001
From: ijones <ijones@syntaxpolice.org>
Date: Mon, 5 Sep 2005 19:03:06 +0000
Subject: [PATCH] resync w/ cvs where Ross beat me to the punch on the
GLASGOW_HASKELL thing
---
Distribution/PreProcess.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Distribution/PreProcess.hs b/Distribution/PreProcess.hs
index 847793ead0..2783c840a8 100644
--- a/Distribution/PreProcess.hs
+++ b/Distribution/PreProcess.hs
@@ -246,12 +246,12 @@ cppOptions bi lbi
[opt | opt@('-':c:_) <- ccOptions bi, c `elem` "DIU"]
hcDefines :: Compiler -> [String]
+hcDefines Compiler { compilerFlavor=GHC, compilerVersion=version }
+ = ["-D__GLASGOW_HASKELL__=" ++ versionInt version]
hcDefines Compiler { compilerFlavor=NHC, compilerVersion=version }
= ["-D__NHC__=" ++ versionInt version]
hcDefines Compiler { compilerFlavor=Hugs }
= ["-D__HUGS__"]
-hcDefines Compiler { compilerFlavor=GHC, compilerVersion=version }
- = ["-D__GLASGOW_HASKELL__=" ++ versionInt version]
hcDefines _ = []
versionInt :: Version -> String
--
GitLab