Skip to content
Permalink
Browse files
8264848: [macos] libjvm.dylib linker warning due to macOS version mis…
…match

Reviewed-by: erikj, dcubed, clanger
  • Loading branch information
RealLucy committed Apr 8, 2021
1 parent 214d6e2 commit 04fa1ed4d0d409bf9bd741297ca95c7f1b7a3e9f
Showing 1 changed file with 11 additions and 1 deletion.
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2021, 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
@@ -78,6 +78,16 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
[
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
JVM_BASIC_ASFLAGS="-x assembler-with-cpp -mno-omit-leaf-frame-pointer -mstack-alignment=16"
# 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 \
-mmacosx-version-min=$MACOSX_VERSION_MIN"
if test -n "$MACOSX_VERSION_MAX"; then
JVM_BASIC_ASFLAGS+="$OS_CFLAGS \
-DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
fi
fi
])

5 comments on commit 04fa1ed

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 04fa1ed Apr 8, 2021

Choose a reason for hiding this comment

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

@VladimirKempik
Copy link

@VladimirKempik VladimirKempik commented on 04fa1ed Aug 26, 2021

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 04fa1ed Aug 26, 2021

Choose a reason for hiding this comment

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

@VladimirKempik the backport was successfully created on the branch VladimirKempik-backport-04fa1ed4 in my personal fork of openjdk/jdk15u-dev. To create a pull request with this backport targeting openjdk/jdk15u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit 04fa1ed4 from the openjdk/jdk repository.

The commit being backported was authored by Lutz Schmidt on 8 Apr 2021 and was reviewed by Erik Joelsson, Daniel D. Daugherty and Christoph Langer.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk15u-dev:

$ git fetch https://github.com/openjdk-bots/jdk15u-dev VladimirKempik-backport-04fa1ed4:VladimirKempik-backport-04fa1ed4
$ git checkout VladimirKempik-backport-04fa1ed4
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk15u-dev VladimirKempik-backport-04fa1ed4

@VladimirKempik
Copy link

@VladimirKempik VladimirKempik commented on 04fa1ed Aug 26, 2021

Choose a reason for hiding this comment

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

/backport jdk13u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 04fa1ed Aug 26, 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 04fa1ed4 to openjdk/jdk13u-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 openjdk/jdk13u-dev:

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

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk13u-dev with the title Backport 04fa1ed4d0d409bf9bd741297ca95c7f1b7a3e9f.

Please sign in to comment.