common/autoconf/flags.m4

*** 218,228 ****
--- 218,232 ----
      C_FLAG_REORDER=''
      CXX_FLAG_REORDER=''
  
      if test "x$OPENJDK_TARGET_OS" = xmacosx; then
        # Linking is different on MacOSX
+       if test "x$BUILD_STATIC" = xtrue; then
+         SHARED_LIBRARY_FLAGS ='-undefined dynamic_lookup'
+       else
          SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
+       fi
        SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
        SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
        SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
        SET_SHARED_LIBRARY_MAPFILE=''
      else
*** 693,703 ****
  
    # Setup some hard coded includes
    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
        -I${JDK_TOPDIR}/src/java.base/share/native/include \
        -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
!       -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/include"
  
    # The shared libraries are compiled using the picflag.
    CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
    CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA"
  
--- 697,709 ----
  
    # Setup some hard coded includes
    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
        -I${JDK_TOPDIR}/src/java.base/share/native/include \
        -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
!       -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/include \
!       -I${JDK_TOPDIR}/src/java.base/share/native/libjava \ 
!       -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/libjava"
  
    # The shared libraries are compiled using the picflag.
    CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
    CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA"