1.1 --- a/common/autoconf/basics.m4 Wed Apr 18 12:37:18 2018 -0700
1.2 +++ b/common/autoconf/basics.m4 Tue Apr 17 09:33:36 2018 -0700
1.3 @@ -377,7 +377,6 @@
1.4 BASIC_REQUIRE_PROGS(CMP, cmp)
1.5 BASIC_REQUIRE_PROGS(COMM, comm)
1.6 BASIC_REQUIRE_PROGS(CP, cp)
1.7 - BASIC_REQUIRE_PROGS(CPIO, cpio)
1.8 BASIC_REQUIRE_PROGS(CUT, cut)
1.9 BASIC_REQUIRE_PROGS(DATE, date)
1.10 BASIC_REQUIRE_PROGS(DIFF, [gdiff diff])
1.11 @@ -427,6 +426,7 @@
1.12 BASIC_PATH_PROGS(READLINK, [greadlink readlink])
1.13 BASIC_PATH_PROGS(DF, df)
1.14 BASIC_PATH_PROGS(SETFILE, SetFile)
1.15 + BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
1.16 ])
1.17
1.18 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
1.19 @@ -859,7 +859,7 @@
1.20 # not be the case in cygwin in certain conditions.
1.21 AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
1.22 [
1.23 - if test x"$OPENJDK_BUILD_OS" = xwindows; then
1.24 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.25 file_to_test="$SRC_ROOT/LICENSE"
1.26 if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
1.27 AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
