Skip to content

D
dragonwell8

openanolis / dragonwell8

通知 5
Star 3
Fork 0
D
dragonwell8
提交 578f83cc 编写于 作者: D dholmes
浏览文件
操作

Merge

上级 63f872bb 0a5b31cf
隐藏空白更改
内联 并排
Showing with 13 addition and 1 deletion
common/autoconf/generated-configure.sh
浏览文件 @ 578f83cc
...@@ -649,6 +649,7 @@ CXXFLAGS_JDKEXE ...@@ -649,6 +649,7 @@ CXXFLAGS_JDKEXE
CXXFLAGS_JDKLIB CXXFLAGS_JDKLIB
CFLAGS_JDKEXE CFLAGS_JDKEXE
CFLAGS_JDKLIB CFLAGS_JDKLIB
MACOSX_REQUIRED_VERSION
PACKAGE_PATH PACKAGE_PATH
LEGACY_EXTRA_LDFLAGS LEGACY_EXTRA_LDFLAGS
LEGACY_EXTRA_CXXFLAGS LEGACY_EXTRA_CXXFLAGS
...@@ -3731,7 +3732,7 @@ fi ...@@ -3731,7 +3732,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1361137039 DATE_WHEN_GENERATED=1361218904
############################################################################### ###############################################################################
# #
...@@ -28241,6 +28242,10 @@ if test "x$OPENJDK_TARGET_OS" = xsolaris; then ...@@ -28241,6 +28242,10 @@ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
fi fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then if test "x$OPENJDK_TARGET_OS" = xmacosx; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
# Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
MACOSX_REQUIRED_VERSION=1070
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)"
fi fi
if test "x$OPENJDK_TARGET_OS" = xbsd; then if test "x$OPENJDK_TARGET_OS" = xbsd; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
common/autoconf/spec.gmk.in
浏览文件 @ 578f83cc
...@@ -282,6 +282,9 @@ X_CFLAGS:=@X_CFLAGS@ ...@@ -282,6 +282,9 @@ X_CFLAGS:=@X_CFLAGS@
X_LIBS:=@X_LIBS@ X_LIBS:=@X_LIBS@
OPENWIN_HOME:=@OPENWIN_HOME@ OPENWIN_HOME:=@OPENWIN_HOME@
# The lowest required version of macosx to enforce compatiblity for
MACOSX_REQUIRED_VERSION=@MACOSX_REQUIRED_VERSION@
# There are two types: CC or CL # There are two types: CC or CL
# CC is gcc and others behaving reasonably similar. # CC is gcc and others behaving reasonably similar.
# CL is cl.exe only. # CL is cl.exe only.
......
common/autoconf/toolchain.m4
浏览文件 @ 578f83cc
...@@ -876,6 +876,10 @@ if test "x$OPENJDK_TARGET_OS" = xsolaris; then ...@@ -876,6 +876,10 @@ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
fi fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then if test "x$OPENJDK_TARGET_OS" = xmacosx; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
# Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
MACOSX_REQUIRED_VERSION=1070
AC_SUBST(MACOSX_REQUIRED_VERSION)
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)"
fi fi
if test "x$OPENJDK_TARGET_OS" = xbsd; then if test "x$OPENJDK_TARGET_OS" = xbsd; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或