@@ -13,10 +13,11 @@ import System.Exit
13main = defaultMainWithHooks hk
13main = defaultMainWithHooks hk
15 hk = simpleUserHooks { buildHook = \pd lbi uh bf -> do
15 hk = simpleUserHooks { buildHook = \pd lbi uh bf -> do
16− let ccProg = Program "gcc" undefined undefined undefined
16+ -- let ccProg = Program "gcc" undefined undefined undefined
17+ let hcProg = Program "ghc" undefined undefined undefined
17− mConf = lookupProgram ccProg (withPrograms lbi)
18+ mConf = lookupProgram hcProg (withPrograms lbi)
18− err = error "Could not determine C compiler"
19+ err = error "Could not determine C compiler"
19− cc = locationPath . programLocation . maybe err id $ mConf
20+ cc = locationPath . programLocation . maybe err id $ mConf
20 b <- canUseRDRAND cc
21 b <- canUseRDRAND cc
21 let newWithPrograms1 = userSpecifyArgs "gcc" cArgs (withPrograms lbi)
22 let newWithPrograms1 = userSpecifyArgs "gcc" cArgs (withPrograms lbi)
22 newWithPrograms = userSpecifyArgs "ghc" cArgsHC newWithPrograms1
23 newWithPrograms = userSpecifyArgs "ghc" cArgsHC newWithPrograms1
@@ -43,6 +44,6 @@ canUseRDRAND cc = do
43 , " return (!err);"
44 , " return (!err);"
46− ec <- rawSystemExitCode normal cc [tmpDir </> "testRDRAND.c", "-o" ++ tmpDir ++ "/a.out"]
47+ ec <- rawSystemExitCode normal cc [tmpDir </> "testRDRAND.c", "-o", tmpDir ++ "/a.o","-c"]
47 notice normal $ "Result of RDRAND Test: " ++ show (ec == ExitSuccess)
48 notice normal $ "Result of RDRAND Test: " ++ show (ec == ExitSuccess)
48 return (ec == ExitSuccess)
49 return (ec == ExitSuccess)