[commit: ghc] master: Fix path to the new build system, now called Hadrian. (f99db38)
git at git.haskell.org
git at git.haskell.org
Thu Apr 28 22:29:25 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/f99db383b9b280a6611c640180efffbd97fc319f/ghc
>---------------------------------------------------------------
commit f99db383b9b280a6611c640180efffbd97fc319f
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Thu Apr 28 23:32:14 2016 +0100
Fix path to the new build system, now called Hadrian.
Summary:
The new Shake-based build system has been given a name -- Hadrian,
and now lives in /hadrian directory.
This fixes the path to the configuration file to be populated by
the configure script.
Test Plan: Run Hadrian build.
Reviewers: thomie, bgamari, hvr, austin
Reviewed By: austin
Subscribers: erikd
Differential Revision: https://phabricator.haskell.org/D2153
>---------------------------------------------------------------
f99db383b9b280a6611c640180efffbd97fc319f
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index a5ee3bc..defc182 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1099,9 +1099,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
-# Create the configuration for the Shake-based build system if it is present
-if test -e shake-build/cfg/system.config.in; then
- AC_CONFIG_FILES([shake-build/cfg/system.config])
+# Create the configuration for the Hadrian build system if it is present
+if test -e hadrian/cfg/system.config.in; then
+ AC_CONFIG_FILES([hadrian/cfg/system.config])
fi
# We got caught by
More information about the ghc-commits
mailing list