diff options
author | asaha <none@none> | 2015-06-17 23:23:12 -0700 |
---|---|---|
committer | asaha <none@none> | 2015-06-17 23:23:12 -0700 |
commit | 79553ed9e9ab2cfec89e72857e3a10969ddda6af (patch) | |
tree | be49466d2e0858ba15841b449f93a0b302fedb5b /make | |
parent | a74140d5d7ab4020c9a77c77c8d591037abf2b5a (diff) | |
parent | 5b43b3389a002af18bee976483c27e427d797bff (diff) | |
download | jdk8u_hotspot-79553ed9e9ab2cfec89e72857e3a10969ddda6af.tar.gz |
Merge
Diffstat (limited to 'make')
-rw-r--r-- | make/linux/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/linux/Makefile b/make/linux/Makefile index df4509348..720eb9018 100644 --- a/make/linux/Makefile +++ b/make/linux/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -229,7 +229,7 @@ checks: check_os_version check_j2se_version # Solaris 2.5.1, 2.6). # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. -SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% +SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% OS_VERSION := $(shell uname -r) EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) |