[commit: ghc] master: Make boot work if ACLOCAL_PATH is not set (101e904)

git at git.haskell.org git at git.haskell.org
Thu Jul 12 15:38:14 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/101e90472b5536fffce1c19324db45451faf5246/ghc

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

commit 101e90472b5536fffce1c19324db45451faf5246
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Mon Jul 9 16:17:57 2018 +0100

    Make boot work if ACLOCAL_PATH is not set


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

101e90472b5536fffce1c19324db45451faf5246
 boot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot b/boot
index d57dcc8..29643e4 100755
--- a/boot
+++ b/boot
@@ -151,7 +151,7 @@ def autoreconf():
         # Get the normalized ACLOCAL_PATH for Windows
         # This is necessary since on Windows this will be a Windows
         # path, which autoreconf doesn't know doesn't know how to handle.
-        ac_local = os.environ['ACLOCAL_PATH']
+        ac_local = os.getenv('ACLOCAL_PATH', '')
         ac_local_arg = re.sub(r';', r':', ac_local)
         ac_local_arg = re.sub(r'\\', r'/', ac_local_arg)
         ac_local_arg = re.sub(r'(\w):/', r'/\1/', ac_local_arg)



More information about the ghc-commits mailing list