[commit: ghc] master: Add Shake configuration to configure.ac (86ad116)

git at git.haskell.org git at git.haskell.org
Thu Dec 17 11:54:18 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/86ad116fd73824776a6addd7b068db4358093bee/ghc

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

commit 86ad116fd73824776a6addd7b068db4358093bee
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Dec 17 12:14:17 2015 +0100

    Add Shake configuration to configure.ac
    
    The Shake build system requires that this file be generated by autoconf.
    Generate it if we find a shake tree.
    
    Reviewers: austin, hvr
    
    Reviewed By: hvr
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1638


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

86ad116fd73824776a6addd7b068db4358093bee
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index c8708ae..0f335a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1098,6 +1098,9 @@ if grep '	' compiler/ghc.cabal.in 2>&1 >/dev/null; then
    AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
 fi
 
+if test -e shake/cfg/system.config.in; then
+    AC_CONFIG_FILES([shake/cfg/system.config])
+fi
 AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
 AC_OUTPUT
 



More information about the ghc-commits mailing list