diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-03 20:41:44 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-09 16:21:14 -0400 |
| commit | 817c1a947d50a070613815e02a530f83d9078eb8 (patch) | |
| tree | a044789c0cbd1a3a73ed495afc599167aff39bbf /hadrian | |
| parent | 63a5371d420686f4959a5be9e5a0d3d647577615 (diff) | |
| download | haskell-817c1a947d50a070613815e02a530f83d9078eb8.tar.gz | |
Define GHC_STAGE in headers instead of command-line
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 4 | ||||
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index 3e4815216a..3faafbaaf7 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -239,6 +239,8 @@ generateGhcPlatformH = do [ "#if !defined(__GHCPLATFORM_H__)" , "#define __GHCPLATFORM_H__" , "" + , "#define GHC_STAGE " ++ show (fromEnum stage + 1) + , "" , "#define BuildPlatform_TYPE " ++ cppify buildPlatform , "#define HostPlatform_TYPE " ++ cppify hostPlatform , "" @@ -369,7 +371,7 @@ generateConfigHs = do , "cBooterVersion = " ++ show cBooterVersion , "" , "cStage :: String" - , "cStage = show (GHC_STAGE :: Int)" + , "cStage = show (" ++ show (fromEnum stage + 1) ++ " :: Int)" ] -- | Generate @ghcautoconf.h@ header. diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 6c6b00064c..94a586444d 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -58,8 +58,7 @@ packageArgs = do pure ["-O0"] ] , builder (Cabal Setup) ? mconcat - [ arg $ "--ghc-option=-DGHC_STAGE=" ++ show (fromEnum stage + 1) - , arg "--disable-library-for-ghci" + [ arg "--disable-library-for-ghci" , anyTargetOs ["openbsd"] ? arg "--ld-options=-E" , flag GhcUnregisterised ? arg "--ghc-option=-DNO_REGS" , notM ghcWithSMP ? arg "--ghc-option=-DNOSMP" |