[commit: ghc] master: Stop generating make files when using hadrian. (606bbc3)

git at git.haskell.org git at git.haskell.org
Mon Nov 20 04:35:56 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/606bbc310654fcf56fe068905bb1aca30d2f0a8a/ghc

>---------------------------------------------------------------

commit 606bbc310654fcf56fe068905bb1aca30d2f0a8a
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sun Nov 19 22:12:09 2017 -0500

    Stop generating make files when using hadrian.
    
    The boot script generates lots of .mk files
    for the make based build system. This change adds
    a `--hadrian` flag to `boot`, which skips the `.mk`
    file generation.
    
    Reviewers: bgamari
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D4211


>---------------------------------------------------------------

606bbc310654fcf56fe068905bb1aca30d2f0a8a
 boot | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/boot b/boot
index b6ecc09..05706af 100755
--- a/boot
+++ b/boot
@@ -14,6 +14,7 @@ cwd = os.getcwd()
 parser = argparse.ArgumentParser()
 parser.add_argument('--validate', action='store_true', help='Run in validate mode')
 parser.add_argument('--required-tag', type=str, action='append', default=set())
+parser.add_argument('--hadrian', action='store_true', help='Do not assume the make base build system')
 args = parser.parse_args()
 
 def print_err(s):
@@ -180,6 +181,8 @@ def check_build_mk():
             """))
 
 check_for_url_rewrites()
-boot_pkgs()
+if not args.hadrian:
+    boot_pkgs()
 autoreconf()
-check_build_mk()
+if not args.hadrian:
+    check_build_mk()



More information about the ghc-commits mailing list