Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8272700: [macos] Build failure with Xcode 13.0 after JDK-8264848 
Reviewed-by: dholmes
  • Loading branch information
@DamonFool
DamonFool committed Aug 19, 2021
1 parent f4be211 commit d007be0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions make/autoconf/flags-other.m4
View file
Expand Up @@ -89,11 +89,11 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
# Fix linker warning.
# Code taken from make/autoconf/flags-cflags.m4 and adapted.
JVM_BASIC_ASFLAGS+="-DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
JVM_BASIC_ASFLAGS+=" -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
-mmacosx-version-min=$MACOSX_VERSION_MIN"
if test -n "$MACOSX_VERSION_MAX"; then
JVM_BASIC_ASFLAGS+="$OS_CFLAGS \
JVM_BASIC_ASFLAGS+=" $OS_CFLAGS \
-DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
fi
fi
Expand Down

3 comments on commit d007be0

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@VladimirKempik
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk15u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on d007be0 Sep 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@VladimirKempik could not automatically backport d007be09 to Optional[openjdk/jdk15u-dev] due to conflicts in the following files:

  • make/autoconf/flags-other.m4

To manually resolve these conflicts run the following commands in your personal fork of Optional[openjdk/jdk15u-dev]:

$ git checkout -b VladimirKempik-backport-d007be09
$ git fetch --no-tags https://git.openjdk.java.net/jdk d007be0952abdc8beb7b68ebf7529a939162307b
$ git cherry-pick --no-commit d007be0952abdc8beb7b68ebf7529a939162307b
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport d007be0952abdc8beb7b68ebf7529a939162307b'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the Optional[openjdk/jdk15u-dev] with the title Backport d007be0952abdc8beb7b68ebf7529a939162307b.

Please sign in to comment.