Skip to content
This repository was archived by the owner on Jan 10, 2019. It is now read-only.

Fix check on AIX to determine if a file system is local #2

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix check on AIX to determine if a file system is local #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4793826
Fix check on AIX to determine if a file system is local
Oct 18, 2017
80e7e55
Update help.m4 to correctly detect local disks on AIX during configure
Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions common/autoconf/basics.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,10 +1156,18 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
$2
fi
else
if $DF -l $1 > /dev/null 2>&1; then
$2
if test "x$OPENJDK_BUILD_OS_ENV" = "xaix"; then
if $DF -T local $1 > /dev/null 2>&1; then
$2
else
$3
fi
else
$3
if $DF -l $1 > /dev/null 2>&1; then
$2
else
$3
fi
fi
fi
])
Expand Down
16 changes: 12 additions & 4 deletions common/autoconf/generated-configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5186,7 +5186,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE

# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1496926402
DATE_WHEN_GENERATED=1508410971

###############################################################################
#
Expand Down Expand Up @@ -67475,10 +67475,18 @@ $as_echo_n "checking if build directory is on local disk... " >&6; }
OUTPUT_DIR_IS_LOCAL="yes"
fi
else
if $DF -l $OUTPUT_ROOT > /dev/null 2>&1; then
OUTPUT_DIR_IS_LOCAL="yes"
if test "x$OPENJDK_BUILD_OS_ENV" = "xaix"; then
if $DF -T local $OUTPUT_ROOT > /dev/null 2>&1; then
OUTPUT_DIR_IS_LOCAL="yes"
else
OUTPUT_DIR_IS_LOCAL="no"
fi
else
OUTPUT_DIR_IS_LOCAL="no"
if $DF -l $OUTPUT_ROOT > /dev/null 2>&1; then
OUTPUT_DIR_IS_LOCAL="yes"
else
OUTPUT_DIR_IS_LOCAL="no"
fi
fi
fi

Expand Down