< prev index next >
common/autoconf/platform.m4
Print this page
@@ -431,41 +431,26 @@
fi
AC_SUBST(HOTSPOT_$1_CPU_DEFINE)
])
-AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
+AC_DEFUN([PLATFORM_SET_MODULE_TARGET_OS_VALUES],
[
- if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
- REQUIRED_OS_NAME=SunOS
- REQUIRED_OS_VERSION=5.10
- fi
- if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
- REQUIRED_OS_NAME=Linux
- REQUIRED_OS_VERSION=2.6
- fi
- if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
- REQUIRED_OS_NAME=Windows
- if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
- REQUIRED_OS_VERSION=5.2
+ if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ OPENJDK_MODULE_TARGET_OS_NAME="macos"
else
- REQUIRED_OS_VERSION=5.1
- fi
- fi
- if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
- REQUIRED_OS_NAME="Mac OS X"
- REQUIRED_OS_VERSION=11.2
+ OPENJDK_MODULE_TARGET_OS_NAME="$OPENJDK_TARGET_OS"
fi
- if test "x$OPENJDK_TARGET_OS" = "xaix"; then
- REQUIRED_OS_NAME=AIX
- REQUIRED_OS_VERSION=7.1
+
+ if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ OPENJDK_MODULE_TARGET_OS_ARCH="amd64"
+ else
+ OPENJDK_MODULE_TARGET_OS_ARCH="$OPENJDK_TARGET_CPU"
fi
- REQUIRED_OS_ARCH=${OPENJDK_TARGET_CPU}
- AC_SUBST(REQUIRED_OS_NAME)
- AC_SUBST(REQUIRED_OS_ARCH)
- AC_SUBST(REQUIRED_OS_VERSION)
+ AC_SUBST(OPENJDK_MODULE_TARGET_OS_NAME)
+ AC_SUBST(OPENJDK_MODULE_TARGET_OS_ARCH)
])
#%%% Build and target systems %%%
AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
[
@@ -478,11 +463,11 @@
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
PLATFORM_EXTRACT_TARGET_AND_BUILD
PLATFORM_SETUP_TARGET_CPU_BITS
- PLATFORM_SET_RELEASE_FILE_OS_VALUES
+ PLATFORM_SET_MODULE_TARGET_OS_VALUES
PLATFORM_SETUP_LEGACY_VARS
])
AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
[
< prev index next >