digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-11-10 10:46:11 +03:00
Code Issues Projects Releases Wiki Activity

Fix up the CPP flags that are defined (#1694)

Browse Source
This commit is contained in:
Neil Mitchell 2019-06-17 13:10:15 +02:00 committed by Neil Mitchell
parent 9c0a956e1f
commit 72f8e3e5a6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/haskell-ide-core/src/Development/IDE/Functions/CPP.hs
View File

@ -28,6 +28,7 @@ import FileCleanup
import System.Directory
import System.FilePath
import Control.Monad
import System.Info
import Data.List ( intercalate )
import Data.Maybe
import Data.Version
@ -52,11 +53,12 @@ doCpp dflags raw input_fn output_fn = do
| otherwise = SysTools.runCc
dflags (SysTools.Option "-E" : args)
let target_defs = [] {-
[ "-D" ++ HOST_OS ++ "_BUILD_OS",
"-D" ++ HOST_ARCH ++ "_BUILD_ARCH",
"-D" ++ TARGET_OS ++ "_HOST_OS",
"-D" ++ TARGET_ARCH ++ "_HOST_ARCH" ] -}
let target_defs =
-- NEIL: Patched to use System.Info instead of constants from CPP
[ "-D" ++ os ++ "_BUILD_OS",
"-D" ++ arch ++ "_BUILD_ARCH",
"-D" ++ os ++ "_HOST_OS",
"-D" ++ arch ++ "_HOST_ARCH" ]
-- remember, in code we *compile*, the HOST is the same our TARGET,
-- and BUILD is the same as our HOST.