[commit: ghc] master: Revert "Amend configure script to support lndir build tree" (d55035f)

git at git.haskell.org git at git.haskell.org
Sun Jun 17 03:33:30 UTC 2018


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

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

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

commit d55035f5fe1312f81a7d3af397d117820e85ad57
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Jun 16 23:31:07 2018 -0400

    Revert "Amend configure script to support lndir build tree"
    
    This appears to inexplicably break the OS X build, which fails with:
    ```
    make[1]: *** No rule to make target `utils/unlit/fs.c', needed by
             `utils/unlit/dist/build/.depend.c_asm'.  Stop.
    make[1]: *** Waiting for unfinished jobs....
    make: *** [all] Error 2
    ```
    
    This reverts commit 8ee9c574a6d2105ace858f0fee31750acafe0a0f.


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

d55035f5fe1312f81a7d3af397d117820e85ad57
 configure.ac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index cf30311..2e6e644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -673,11 +673,11 @@ dnl --------------------------------------------------------------
 dnl ** Copy the files from the "fs" utility into the right folders.
 dnl --------------------------------------------------------------
 AC_MSG_NOTICE([Creating links for in-tree file handling routines.])
-ln -f -v -L utils/fs/fs.* utils/lndir/
-ln -f -v -L utils/fs/fs.* utils/unlit/
-ln -f -v -L utils/fs/fs.* rts/
-ln -f -v -L utils/fs/fs.h libraries/base/include/
-ln -f -v -L utils/fs/fs.c libraries/base/cbits/
+ln -f -v utils/fs/fs.* utils/lndir/
+ln -f -v utils/fs/fs.* utils/unlit/
+ln -f -v utils/fs/fs.* rts/
+ln -f -v utils/fs/fs.h libraries/base/include/
+ln -f -v utils/fs/fs.c libraries/base/cbits/
 AC_MSG_NOTICE([Routines in place. Packages can now be build normally.])
 
 dnl --------------------------------------------------------------



More information about the ghc-commits mailing list