Skip to content

Commit 37123cb

Browse files
gnu-andrewgnu-andrew
committed
Merge
2 parents 151aa3f + 673e0d1 commit 37123cb

File tree

3 files changed

+26
-68
lines changed

3 files changed

+26
-68
lines changed

‎common/autoconf/flags.m4‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -687,39 +687,18 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
687687
688688
# Additional macosx handling
689689
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
690-
if test "x$TOOLCHAIN_TYPE" = xgcc; then
691-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
692-
# FIXME: clean this up, and/or move it elsewhere.
693-
694-
# Setting these parameters makes it an error to link to macosx APIs that are
695-
# newer than the given OS version and makes the linked binaries compatible
696-
# even if built on a newer version of the OS.
697-
# The expected format is X.Y.Z
698-
MACOSX_VERSION_MIN=10.7.0
699-
AC_SUBST(MACOSX_VERSION_MIN)
700-
701-
# The macro takes the version with no dots, ex: 1070
702-
# Let the flags variables get resolved in make for easier override on make
703-
# command line.
704-
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
705-
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
706-
elif test "x$TOOLCHAIN_TYPE" = xclang; then
707-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
708-
# FIXME: clean this up, and/or move it elsewhere.
709-
710-
# Setting these parameters makes it an error to link to macosx APIs that are
711-
# newer than the given OS version and makes the linked binaries compatible
712-
# even if built on a newer version of the OS.
713-
# The expected format is X.Y.Z
714-
MACOSX_VERSION_MIN=10.9.0
715-
AC_SUBST(MACOSX_VERSION_MIN)
690+
# Setting these parameters makes it an error to link to macOS APIs that are
691+
# newer than the given OS version and makes the linked binaries compatible
692+
# even if built on a newer version of the OS.
693+
# The expected format is X.Y.Z
694+
MACOSX_VERSION_MIN=11.00.00
695+
AC_SUBST(MACOSX_VERSION_MIN)
716696
717-
# The macro takes the version with no dots, ex: 1070
718-
# Let the flags variables get resolved in make for easier override on make
719-
# command line.
720-
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
721-
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
722-
fi
697+
# The macro takes the version with no dots, ex: 1070
698+
# Let the flags variables get resolved in make for easier override on make
699+
# command line.
700+
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
701+
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
723702
fi
724703
725704
# Setup some hard coded includes

‎common/autoconf/generated-configure.sh‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -43379,39 +43379,18 @@ $as_echo "$supports" >&6; }
4337943379

4338043380
# Additional macosx handling
4338143381
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
43382-
if test "x$TOOLCHAIN_TYPE" = xgcc; then
43383-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
43384-
# FIXME: clean this up, and/or move it elsewhere.
43385-
43386-
# Setting these parameters makes it an error to link to macosx APIs that are
43387-
# newer than the given OS version and makes the linked binaries compatible
43388-
# even if built on a newer version of the OS.
43389-
# The expected format is X.Y.Z
43390-
MACOSX_VERSION_MIN=10.7.0
43391-
43392-
43393-
# The macro takes the version with no dots, ex: 1070
43394-
# Let the flags variables get resolved in make for easier override on make
43395-
# command line.
43396-
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43397-
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43398-
elif test "x$TOOLCHAIN_TYPE" = xclang; then
43399-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
43400-
# FIXME: clean this up, and/or move it elsewhere.
43401-
43402-
# Setting these parameters makes it an error to link to macosx APIs that are
43403-
# newer than the given OS version and makes the linked binaries compatible
43404-
# even if built on a newer version of the OS.
43405-
# The expected format is X.Y.Z
43406-
MACOSX_VERSION_MIN=10.9.0
43407-
43408-
43409-
# The macro takes the version with no dots, ex: 1070
43410-
# Let the flags variables get resolved in make for easier override on make
43411-
# command line.
43412-
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43413-
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43414-
fi
43382+
# Setting these parameters makes it an error to link to macOS APIs that are
43383+
# newer than the given OS version and makes the linked binaries compatible
43384+
# even if built on a newer version of the OS.
43385+
# The expected format is X.Y.Z
43386+
MACOSX_VERSION_MIN=11.00.00
43387+
43388+
43389+
# The macro takes the version with no dots, ex: 1070
43390+
# Let the flags variables get resolved in make for easier override on make
43391+
# command line.
43392+
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43393+
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
4341543394
fi
4341643395

4341743396
# Setup some hard coded includes

‎hotspot/make/bsd/makefiles/gcc.make‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -343,7 +343,7 @@ ifeq ($(OS_VENDOR), Darwin)
343343
# if built on a newer version of the OS.
344344
# The expected format is X.Y.Z
345345
ifeq ($(MACOSX_VERSION_MIN),)
346-
MACOSX_VERSION_MIN=10.7.0
346+
MACOSX_VERSION_MIN=11.00.00
347347
endif
348348
# The macro takes the version with no dots, ex: 1070
349349
CFLAGS += -DMAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(MACOSX_VERSION_MIN)) \

0 commit comments

Comments
 (0)