1.1 --- a/common/autoconf/basics.m4 Thu May 31 13:57:22 2018 +0100
1.2 +++ b/common/autoconf/basics.m4 Fri Jun 08 14:06:17 2018 -0700
1.3 @@ -470,61 +470,71 @@
1.4 AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
1.5 [
1.6 AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
1.7 - [use this devkit for compilers, tools and resources])],
1.8 - [
1.9 - BASIC_FIXUP_PATH([with_devkit])
1.10 - DEVKIT_ROOT="$with_devkit"
1.11 - # Check for a meta data info file in the root of the devkit
1.12 - if test -f "$DEVKIT_ROOT/devkit.info"; then
1.13 - . $DEVKIT_ROOT/devkit.info
1.14 - # This potentially sets the following:
1.15 - # A descriptive name of the devkit
1.16 - BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_NAME])
1.17 - # Corresponds to --with-extra-path
1.18 - BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_EXTRA_PATH])
1.19 - # Corresponds to --with-toolchain-path
1.20 - BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_TOOLCHAIN_PATH])
1.21 - # Corresponds to --with-sysroot
1.22 - BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_SYSROOT])
1.23 + [use this devkit for compilers, tools and resources])])
1.24
1.25 - # Identifies the Visual Studio version in the devkit
1.26 - BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_VERSION])
1.27 - # The Visual Studio include environment variable
1.28 - BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_INCLUDE])
1.29 - # The Visual Studio lib environment variable
1.30 - BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_LIB])
1.31 - # Corresponds to --with-msvcr-dll
1.32 - BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCR_DLL])
1.33 - # Corresponds to --with-msvcp-dll
1.34 - BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCP_DLL])
1.35 - fi
1.36 + if test "x$with_devkit" = xyes; then
1.37 + AC_MSG_ERROR([--with-devkit must have a value])
1.38 + elif test "x$with_devkit" != x && test "x$with_devkit" != xno; then
1.39 + BASIC_FIXUP_PATH([with_devkit])
1.40 + DEVKIT_ROOT="$with_devkit"
1.41 + # Check for a meta data info file in the root of the devkit
1.42 + if test -f "$DEVKIT_ROOT/devkit.info"; then
1.43 + . $DEVKIT_ROOT/devkit.info
1.44 + # This potentially sets the following:
1.45 + # A descriptive name of the devkit
1.46 + BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_NAME])
1.47 + # Corresponds to --with-extra-path
1.48 + BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_EXTRA_PATH])
1.49 + # Corresponds to --with-toolchain-path
1.50 + BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_TOOLCHAIN_PATH])
1.51 + # Corresponds to --with-sysroot
1.52 + BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_SYSROOT])
1.53
1.54 - AC_MSG_CHECKING([for devkit])
1.55 - if test "x$DEVKIT_NAME" != x; then
1.56 - AC_MSG_RESULT([$DEVKIT_NAME in $DEVKIT_ROOT])
1.57 - else
1.58 - AC_MSG_RESULT([$DEVKIT_ROOT])
1.59 - fi
1.60 + # Identifies the Visual Studio version in the devkit
1.61 + BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_VERSION])
1.62 + # The Visual Studio include environment variable
1.63 + BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_INCLUDE])
1.64 + # The Visual Studio lib environment variable
1.65 + BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_LIB])
1.66 + # Corresponds to --with-msvcr-dll
1.67 + BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCR_DLL])
1.68 + # Corresponds to --with-msvcp-dll
1.69 + BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCP_DLL])
1.70 + fi
1.71
1.72 - BASIC_PREPEND_TO_PATH([EXTRA_PATH],$DEVKIT_EXTRA_PATH)
1.73 + AC_MSG_CHECKING([for devkit])
1.74 + if test "x$DEVKIT_NAME" != x; then
1.75 + AC_MSG_RESULT([$DEVKIT_NAME in $DEVKIT_ROOT])
1.76 + else
1.77 + AC_MSG_RESULT([$DEVKIT_ROOT])
1.78 + fi
1.79
1.80 - # Fallback default of just /bin if DEVKIT_PATH is not defined
1.81 - if test "x$DEVKIT_TOOLCHAIN_PATH" = x; then
1.82 - DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/bin"
1.83 - fi
1.84 - BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$DEVKIT_TOOLCHAIN_PATH)
1.85 + BASIC_PREPEND_TO_PATH([EXTRA_PATH],$DEVKIT_EXTRA_PATH)
1.86
1.87 - # If DEVKIT_SYSROOT is set, use that, otherwise try a couple of known
1.88 - # places for backwards compatiblity.
1.89 - if test "x$DEVKIT_SYSROOT" != x; then
1.90 - SYSROOT="$DEVKIT_SYSROOT"
1.91 - elif test -d "$DEVKIT_ROOT/$host_alias/libc"; then
1.92 - SYSROOT="$DEVKIT_ROOT/$host_alias/libc"
1.93 - elif test -d "$DEVKIT_ROOT/$host/sys-root"; then
1.94 - SYSROOT="$DEVKIT_ROOT/$host/sys-root"
1.95 - fi
1.96 - ]
1.97 - )
1.98 + # Fallback default of just /bin if DEVKIT_PATH is not defined
1.99 + if test "x$DEVKIT_TOOLCHAIN_PATH" = x; then
1.100 + DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/bin"
1.101 + fi
1.102 + BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$DEVKIT_TOOLCHAIN_PATH)
1.103 +
1.104 + # If DEVKIT_SYSROOT is set, use that, otherwise try a couple of known
1.105 + # places for backwards compatiblity.
1.106 + if test "x$DEVKIT_SYSROOT" != x; then
1.107 + SYSROOT="$DEVKIT_SYSROOT"
1.108 + elif test -d "$DEVKIT_ROOT/$host_alias/libc"; then
1.109 + SYSROOT="$DEVKIT_ROOT/$host_alias/libc"
1.110 + elif test -d "$DEVKIT_ROOT/$host/sys-root"; then
1.111 + SYSROOT="$DEVKIT_ROOT/$host/sys-root"
1.112 + fi
1.113 +
1.114 + if test "x$DEVKIT_ROOT" != x; then
1.115 + DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib"
1.116 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.117 + DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib64"
1.118 + fi
1.119 + AC_SUBST(DEVKIT_LIB_DIR)
1.120 + fi
1.121 + fi
1.122
1.123 # You can force the sysroot if the sysroot encoded into the compiler tools
1.124 # is not correct.
