stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8140591: Add configure argument specifying make executable in JPRT

Browse Source 
Reviewed-by: ihse, tbell
This commit is contained in:
Erik Joelsson 2015-10-29 17:14:34 +01:00
parent 8b1e49f604
commit e82b8fd111
3 changed files with 2089 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/autoconf/basics.m4
View File

@ -283,6 +283,7 @@ AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
# use that value, otherwise search for the tool using the supplied code snippet. # use that value, otherwise search for the tool using the supplied code snippet.
# $1: variable to set # $1: variable to set
# $2: code snippet to call to look for the tool # $2: code snippet to call to look for the tool
# $3: code snippet to call if variable was used to find tool
AC_DEFUN([BASIC_SETUP_TOOL], AC_DEFUN([BASIC_SETUP_TOOL],
[ [
# Publish this variable in the help. # Publish this variable in the help.
@ -340,6 +341,7 @@ AC_DEFUN([BASIC_SETUP_TOOL],
fi fi
fi fi
fi fi
$3
fi fi
]) ])
@ -848,17 +850,8 @@ AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
# Goes looking for a usable version of GNU make. # Goes looking for a usable version of GNU make.
AC_DEFUN([BASIC_CHECK_GNU_MAKE], AC_DEFUN([BASIC_CHECK_GNU_MAKE],
[ [
# We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. BASIC_SETUP_TOOL([MAKE],
if test "x$MAKE" != x; then [
# User has supplied a make, test it.
if test ! -f "$MAKE"; then
AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not found.])
fi
BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE])
if test "x$FOUND_MAKE" = x; then
AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make $MAKE_REQUIRED_VERSION or newer.])
fi
else
# Try our hardest to locate a correct version of GNU make # Try our hardest to locate a correct version of GNU make
AC_PATH_PROGS(CHECK_GMAKE, gmake) AC_PATH_PROGS(CHECK_GMAKE, gmake)
BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH]) BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH])
@ -886,7 +879,13 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE],
if test "x$FOUND_MAKE" = x; then if test "x$FOUND_MAKE" = x; then
AC_MSG_ERROR([Cannot find GNU make $MAKE_REQUIRED_VERSION or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure.]) AC_MSG_ERROR([Cannot find GNU make $MAKE_REQUIRED_VERSION or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure.])
fi fi
fi ],[
# If MAKE was set by user, verify the version
BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE])
if test "x$FOUND_MAKE" = x; then
AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make $MAKE_REQUIRED_VERSION or newer.])
fi
])
MAKE=$FOUND_MAKE MAKE=$FOUND_MAKE
AC_SUBST(MAKE) AC_SUBST(MAKE)

2422
common/autoconf/generated-configure.sh
View File

File diff suppressed because it is too large Load Diff

1
make/jprt.properties
View File

@ -93,6 +93,7 @@ jprt.build.configure.args= \
--with-output-sync=recurse \ --with-output-sync=recurse \
--with-boot-jdk=$ALT_BOOTDIR \ --with-boot-jdk=$ALT_BOOTDIR \
--with-jobs=$ALT_PARALLEL_COMPILE_JOBS \ --with-jobs=$ALT_PARALLEL_COMPILE_JOBS \
MAKE=$JPRT_MAKE \
${my.additional.build.configure.args.${jprt.test.set}} \ ${my.additional.build.configure.args.${jprt.test.set}} \
${my.custom.build.configure.args} ${my.custom.build.configure.args}