mirror of
https://github.com/NixOS/nix.git
synced 2024-10-30 05:40:52 +00:00
Handle platforms that don't support linking to a symlink
E.g. Darwin doesn't allow this.
This commit is contained in:
parent
fd63c8bfcd
commit
e98c029717
12
configure.ac
12
configure.ac
@ -120,6 +120,18 @@ AC_CHECK_HEADERS([sys/mount.h], [], [],
|
|||||||
AC_CHECK_FUNCS([lutimes])
|
AC_CHECK_FUNCS([lutimes])
|
||||||
|
|
||||||
|
|
||||||
|
# Check whether the store optimiser can optimise symlinks.
|
||||||
|
AC_MSG_CHECKING([whether it is possible to create a link to a symlink])
|
||||||
|
ln -s bla tmp_link
|
||||||
|
if ln tmp_link tmp_link2 2> /dev/null; then
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
AC_DEFINE(CAN_LINK_SYMLINK, 1, [Whether link() works on symlinks.])
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
fi
|
||||||
|
rm -f tmp_link tmp_link2
|
||||||
|
|
||||||
|
|
||||||
# Check for <locale>.
|
# Check for <locale>.
|
||||||
AC_LANG_PUSH(C++)
|
AC_LANG_PUSH(C++)
|
||||||
AC_CHECK_HEADERS([locale])
|
AC_CHECK_HEADERS([locale])
|
||||||
|
@ -62,8 +62,13 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We can hard link regular files and symlinks. */
|
/* We can hard link regular files and maybe symlinks. */
|
||||||
if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode)) return;
|
if (!S_ISREG(st.st_mode)
|
||||||
|
#if CAN_LINK_SYMLINK
|
||||||
|
x
|
||||||
|
&& !S_ISLNK(st.st_mode)
|
||||||
|
#endif
|
||||||
|
) return;
|
||||||
|
|
||||||
/* Sometimes SNAFUs can cause files in the Nix store to be
|
/* Sometimes SNAFUs can cause files in the Nix store to be
|
||||||
modified, in particular when running programs as root under
|
modified, in particular when running programs as root under
|
||||||
|
Loading…
Reference in New Issue
Block a user