[commit: ghc] master: boot: Fix computation of TOP (8fa688a)

git at git.haskell.org git at git.haskell.org
Thu Apr 19 22:57:37 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8fa688a84f4e4d86096710edd1f0d19bac3eea90/ghc

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

commit 8fa688a84f4e4d86096710edd1f0d19bac3eea90
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Apr 19 15:07:57 2018 -0400

    boot: Fix computation of TOP
    
    Test Plan: Run `./boot`, check to make sure that
    `libraries/ghc-prim/GNUmakefile` is sane
    
    Subscribers: thomie, carter, sjakobi
    
    Differential Revision: https://phabricator.haskell.org/D4580


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

8fa688a84f4e4d86096710edd1f0d19bac3eea90
 boot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot b/boot
index f913724..d57dcc8 100755
--- a/boot
+++ b/boot
@@ -116,7 +116,7 @@ def boot_pkgs():
             if os.path.isfile(cabal):
                 # strip both .cabal and .in
                 pkg = os.path.splitext(os.path.splitext(os.path.basename(cabal))[0])[0]
-                top = package
+                top = os.path.join(*['..'] * len(os.path.normpath(package).split(os.path.sep)))
 
                 ghc_mk = os.path.join(package, 'ghc.mk')
                 print('Creating %s' % ghc_mk)



More information about the ghc-commits mailing list