Unverified Commit 8c2817a3 authored by Andrey Mokhov's avatar Andrey Mokhov Committed by GitHub

Revert "Preliminary bindist rule (#555)" (#557)

This reverts commit 15797302.
parent 15797302
...@@ -125,18 +125,7 @@ are currently not supported. ...@@ -125,18 +125,7 @@ are currently not supported.
#### Source distribution #### Source distribution
To build a GHC source distribution tarball, run `build source-dist`. To build a GHC source distribution tarball, run `build sdist-ghc`.
#### Binary distribution
To build a GHC binary distribution, run `build binary-dist`. The resulting
tarball contains just enough to support the
``` sh
$ ./configure [--prefix=PATH] && make install
```
workflow, for now.
#### Testing #### Testing
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
alex = @AlexCmd@ alex = @AlexCmd@
ar = @ArCmd@ ar = @ArCmd@
autoreconf = autoreconf
cc = @CC@ cc = @CC@
happy = @HappyCmd@ happy = @HappyCmd@
hs-cpp = @HaskellCPPCmd@ hs-cpp = @HaskellCPPCmd@
......
...@@ -51,7 +51,6 @@ executable hadrian ...@@ -51,7 +51,6 @@ executable hadrian
, Oracles.Setting , Oracles.Setting
, Oracles.ModuleFiles , Oracles.ModuleFiles
, Rules , Rules
, Rules.BinaryDist
, Rules.Clean , Rules.Clean
, Rules.Compile , Rules.Compile
, Rules.Configure , Rules.Configure
......
...@@ -89,7 +89,6 @@ instance NFData HaddockMode ...@@ -89,7 +89,6 @@ instance NFData HaddockMode
-- @GhcPkg Stage1@ is the one built in Stage0. -- @GhcPkg Stage1@ is the one built in Stage0.
data Builder = Alex data Builder = Alex
| Ar ArMode Stage | Ar ArMode Stage
| Autoreconf FilePath
| DeriveConstants | DeriveConstants
| Cc CcMode Stage | Cc CcMode Stage
| Configure FilePath | Configure FilePath
...@@ -175,7 +174,6 @@ instance H.Builder Builder where ...@@ -175,7 +174,6 @@ instance H.Builder Builder where
runtimeDependencies :: Builder -> Action [FilePath] runtimeDependencies :: Builder -> Action [FilePath]
runtimeDependencies = \case runtimeDependencies = \case
Autoreconf dir -> return [dir -/- "configure.ac"]
Configure dir -> return [dir -/- "configure"] Configure dir -> return [dir -/- "configure"]
Ghc _ Stage0 -> return [] Ghc _ Stage0 -> return []
...@@ -234,7 +232,6 @@ instance H.Builder Builder where ...@@ -234,7 +232,6 @@ instance H.Builder Builder where
Ar Unpack _ -> cmd echo [Cwd output] [path] buildArgs Ar Unpack _ -> cmd echo [Cwd output] [path] buildArgs
Autoreconf dir -> cmd echo [Cwd dir] [path] buildArgs
Configure dir -> do Configure dir -> do
-- Inject /bin/bash into `libtool`, instead of /bin/sh, -- Inject /bin/bash into `libtool`, instead of /bin/sh,
-- otherwise Windows breaks. TODO: Figure out why. -- otherwise Windows breaks. TODO: Figure out why.
...@@ -290,7 +287,6 @@ systemBuilderPath builder = case builder of ...@@ -290,7 +287,6 @@ systemBuilderPath builder = case builder of
Alex -> fromKey "alex" Alex -> fromKey "alex"
Ar _ Stage0 -> fromKey "system-ar" Ar _ Stage0 -> fromKey "system-ar"
Ar _ _ -> fromKey "ar" Ar _ _ -> fromKey "ar"
Autoreconf _ -> fromKey "autoreconf"
Cc _ Stage0 -> fromKey "system-cc" Cc _ Stage0 -> fromKey "system-cc"
Cc _ _ -> fromKey "cc" Cc _ _ -> fromKey "cc"
-- We can't ask configure for the path to configure! -- We can't ask configure for the path to configure!
......
...@@ -13,7 +13,6 @@ data HaddockMode = BuildPackage | BuildIndex ...@@ -13,7 +13,6 @@ data HaddockMode = BuildPackage | BuildIndex
data Builder = Alex data Builder = Alex
| Ar ArMode Stage | Ar ArMode Stage
| Autoreconf FilePath
| DeriveConstants | DeriveConstants
| Cc CcMode Stage | Cc CcMode Stage
| Configure FilePath | Configure FilePath
......
...@@ -8,16 +8,15 @@ import qualified Hadrian.Oracles.TextFile ...@@ -8,16 +8,15 @@ import qualified Hadrian.Oracles.TextFile
import Expression import Expression
import GHC import GHC
import qualified Oracles.ModuleFiles import qualified Oracles.ModuleFiles
import qualified Rules.BinaryDist
import qualified Rules.Compile import qualified Rules.Compile
import qualified Rules.Configure import qualified Rules.PackageData
import qualified Rules.Dependencies import qualified Rules.Dependencies
import qualified Rules.Documentation import qualified Rules.Documentation
import qualified Rules.Generate import qualified Rules.Generate
import qualified Rules.Configure
import qualified Rules.Gmp import qualified Rules.Gmp
import qualified Rules.Libffi import qualified Rules.Libffi
import qualified Rules.Library import qualified Rules.Library
import qualified Rules.PackageData
import qualified Rules.Program import qualified Rules.Program
import qualified Rules.Register import qualified Rules.Register
import Settings import Settings
...@@ -123,7 +122,6 @@ packageRules = do ...@@ -123,7 +122,6 @@ packageRules = do
buildRules :: Rules () buildRules :: Rules ()
buildRules = do buildRules = do
Rules.BinaryDist.bindistRules
Rules.Configure.configureRules Rules.Configure.configureRules
Rules.Generate.copyRules Rules.Generate.copyRules
Rules.Generate.generateRules Rules.Generate.generateRules
......
...@@ -9,7 +9,7 @@ import Rules.Clean ...@@ -9,7 +9,7 @@ import Rules.Clean
sourceDistRules :: Rules () sourceDistRules :: Rules ()
sourceDistRules = do sourceDistRules = do
"source-dist" ~> do "sdist-ghc" ~> do
-- We clean the source tree first. -- We clean the source tree first.
-- See https://github.com/snowleopard/hadrian/issues/384. -- See https://github.com/snowleopard/hadrian/issues/384.
-- TODO: Do we still need to clean the tree? -- TODO: Do we still need to clean the tree?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment