Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
8257633: Missing -mmacosx-version-min=X flag when linking libjvm
- Loading branch information
Showing
with
3 additions
and
3 deletions.
-
+3
−3
make/autoconf/flags-ldflags.m4
|
@@ -110,7 +110,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER], |
|
|
# Assume clang or gcc. |
|
|
# FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead. |
|
|
OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.." |
|
|
OS_LDFLAGS_JDK_ONLY="-mmacosx-version-min=$MACOSX_VERSION_MIN" |
|
|
OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN" |
|
|
fi |
|
|
fi |
|
|
|
|
@@ -209,13 +209,13 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP], |
|
|
|
|
|
# Export variables according to old definitions, prefix with $2 if present. |
|
|
LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY \ |
|
|
$OS_LDFLAGS_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}" |
|
|
$OS_LDFLAGS $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}" |
|
|
$2LDFLAGS_JDKLIB="$LDFLAGS_JDK_COMMON $BASIC_LDFLAGS_JDK_LIB_ONLY \ |
|
|
${$1_LDFLAGS_JDK_LIBPATH} $SHARED_LIBRARY_FLAGS" |
|
|
$2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS \ |
|
|
${$1_CPU_EXECUTABLE_LDFLAGS}" |
|
|
|
|
|
$2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS_JVM_ONLY \ |
|
|
$2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS $OS_LDFLAGS_JVM_ONLY \ |
|
|
$DEBUGLEVEL_LDFLAGS $DEBUGLEVEL_LDFLAGS_JVM_ONLY $BASIC_LDFLAGS_ONLYCXX \ |
|
|
${$1_CPU_LDFLAGS} ${$1_CPU_LDFLAGS_JVM_ONLY} ${$2EXTRA_LDFLAGS}" |
|
|
|
|
|
This comment has been minimized.
445bfe0
Review
Issues