vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix removal of {cpu,machine} links on mingw/msys

Browse source 
At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds,
but results in what looks like hard link. Subsequent "rm -f dir2" (e.g.
during second config.status invocation) fails. Check that we also can
remove link to directory.

Make it more clear in message that we are checking "ln -s".
This commit is contained in:
Andrey Borzenkov 2014-01-18 22:48:04 +04:00
parent 0b47c57ad6
commit e0a850947f
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
* acinclude.m4 (grub_CHECK_LINK_DIR): Check that we can also remove
symbolic link to directory. It fails in Msys shell on Windows 2003.
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com> 2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* Makefile.am (default_payload.elf): Add modules * Makefile.am (default_payload.elf): Add modules

6
acinclude.m4
View file

@ -418,15 +418,15 @@ else
[fi] [fi]
]) ])
dnl Check if ln can handle directories properly (mingw). dnl Check if ln -s can handle directories properly (mingw).
AC_DEFUN([grub_CHECK_LINK_DIR],[ AC_DEFUN([grub_CHECK_LINK_DIR],[
AC_MSG_CHECKING([whether ln can handle directories properly]) AC_MSG_CHECKING([whether ln -s can handle directories properly])
[mkdir testdir 2>/dev/null [mkdir testdir 2>/dev/null
case $srcdir in case $srcdir in
[\\/$]* | ?:[\\/]* ) reldir=$srcdir/include/grub/util ;; [\\/$]* | ?:[\\/]* ) reldir=$srcdir/include/grub/util ;;
*) reldir=../$srcdir/include/grub/util ;; *) reldir=../$srcdir/include/grub/util ;;
esac esac
if ln -s $reldir testdir/util 2>/dev/null ; then] if ln -s $reldir testdir/util 2>/dev/null && rm -f testdir/util 2>/dev/null ; then]
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
[link_dir=yes [link_dir=yes
else else