You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.8 KiB
52 lines
1.8 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Andrey Borzenkov <arvidjaar@gmail.com> |
|
Date: Sat, 18 Jan 2014 22:48:04 +0400 |
|
Subject: [PATCH] fix removal of {cpu,machine} links on mingw/msys |
|
|
|
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". |
|
--- |
|
ChangeLog | 5 +++++ |
|
acinclude.m4 | 6 +++--- |
|
2 files changed, 8 insertions(+), 3 deletions(-) |
|
|
|
diff --git a/ChangeLog b/ChangeLog |
|
index cff9386d3d2..c3bfa9fcb1b 100644 |
|
--- a/ChangeLog |
|
+++ b/ChangeLog |
|
@@ -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> |
|
|
|
* Makefile.am (default_payload.elf): Add modules |
|
diff --git a/acinclude.m4 b/acinclude.m4 |
|
index 32d5477d100..b2bb88d838e 100644 |
|
--- a/acinclude.m4 |
|
+++ b/acinclude.m4 |
|
@@ -418,15 +418,15 @@ else |
|
[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_MSG_CHECKING([whether ln can handle directories properly]) |
|
+AC_MSG_CHECKING([whether ln -s can handle directories properly]) |
|
[mkdir testdir 2>/dev/null |
|
case $srcdir in |
|
[\\/$]* | ?:[\\/]* ) reldir=$srcdir/include/grub/util ;; |
|
*) reldir=../$srcdir/include/grub/util ;; |
|
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]) |
|
[link_dir=yes |
|
else
|
|
|