common/autoconf/flags.m4

*** 1155,1184 ****
      $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
          -libpath:${OUTPUT_ROOT}/support/modules_libs/java.base"
      $2JDKLIB_LIBS=""
    else
      $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
!         -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)"
  
      if test "x$1" = "xTARGET"; then
      # On some platforms (mac) the linker warns about non existing -L dirs.
      # Add server first if available. Linking aginst client does not always produce the same results.
        # Only add client/minimal dir if client/minimal is being built.
      # Default to server for other variants.
        if HOTSPOT_CHECK_JVM_VARIANT(server); then
!         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
        elif HOTSPOT_CHECK_JVM_VARIANT(client); then
!         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/client"
        elif HOTSPOT_CHECK_JVM_VARIANT(minimal); then
!         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/minimal"
      else
!         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
      fi
      elif test "x$1" = "xBUILD"; then
        # When building a buildjdk, it's always only the server variant
        $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
!           -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
      fi
  
      $2JDKLIB_LIBS="-ljava -ljvm"
      if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
        $2JDKLIB_LIBS="[$]$2JDKLIB_LIBS -lc"
--- 1155,1184 ----
      $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
          -libpath:${OUTPUT_ROOT}/support/modules_libs/java.base"
      $2JDKLIB_LIBS=""
    else
      $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
!         -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base"
  
      if test "x$1" = "xTARGET"; then
      # On some platforms (mac) the linker warns about non existing -L dirs.
      # Add server first if available. Linking aginst client does not always produce the same results.
        # Only add client/minimal dir if client/minimal is being built.
      # Default to server for other variants.
        if HOTSPOT_CHECK_JVM_VARIANT(server); then
!         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
        elif HOTSPOT_CHECK_JVM_VARIANT(client); then
!         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/client"
        elif HOTSPOT_CHECK_JVM_VARIANT(minimal); then
!         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/minimal"
      else
!         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
      fi
      elif test "x$1" = "xBUILD"; then
        # When building a buildjdk, it's always only the server variant
        $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
!           -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
      fi
  
      $2JDKLIB_LIBS="-ljava -ljvm"
      if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
        $2JDKLIB_LIBS="[$]$2JDKLIB_LIBS -lc"