From de3edc0771a914d641fa9f3d22e27cb321e0625c Mon Sep 17 00:00:00 2001 From: malcolm Date: Thu, 6 Jan 2005 10:44:14 +0000 Subject: [PATCH] [project @ 2005-01-06 10:44:14 by malcolm] It seems that ghc-6.2.x doesn't have Compat.RawSystem, so should use System.Cmd instead. And ghc-5.04.x doesn't export rawSystem from there either, so should use the simple inline definition. --- ghc/utils/hsc2hs/Main.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ghc/utils/hsc2hs/Main.hs b/ghc/utils/hsc2hs/Main.hs index 12cc9cd..b93728b 100644 --- a/ghc/utils/hsc2hs/Main.hs +++ b/ghc/utils/hsc2hs/Main.hs @@ -1,7 +1,7 @@ {-# OPTIONS -fffi -cpp #-} ------------------------------------------------------------------------ --- $Id: Main.hs,v 1.63 2005/01/05 15:06:25 ross Exp $ +-- $Id: Main.hs,v 1.64 2005/01/06 10:44:14 malcolm Exp $ -- -- Program for converting .hsc files to .hs files, by converting the -- file into a C program which is run to generate the Haskell source. @@ -34,12 +34,12 @@ import CString #endif -#ifdef __GLASGOW_HASKELL__ +#if __GLASGOW_HASKELL__ >= 603 import Compat.RawSystem ( rawSystem ) -#elif __HUGS__ || __NHC__ >= 117 +#elif __HUGS__ || __NHC__ >= 117 || __GLASGOW_HASKELL__ >= 600 import System.Cmd ( rawSystem ) #else -rawSystem prog args = system (prog++unwords args) +rawSystem prog args = system (prog++" "++unwords args) #endif version :: String -- 1.7.10.4