common/autoconf/platform.m4

@  rev 2562 : imported patch alpinefixes-launcherfix
|

*** 138,147 ****
--- 138,159 ----
        ;;
      *)
        AC_MSG_ERROR([unsupported operating system $1])
        ;;
    esac
+ 
+   case "$1" in
+     *linux*-musl)
+       VAR_CLIB=musl
+       ;;
+     *linux*-gnu)
+       VAR_CLIB=gnu
+       ;;
+     *)
+       VAR_CLIB=
+       ;;
+   esac
  ])
  
  # Expects $host_os $host_cpu $build_os and $build_cpu
  # and $with_target_bits to have been setup!
  #
*** 176,196 ****
--- 188,215 ----
    fi
    OPENJDK_BUILD_CPU="$VAR_CPU"
    OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
    OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
    OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
+   OPENJDK_BUILD_CLIB="$VAR_CLIB"
    AC_SUBST(OPENJDK_BUILD_OS)
    AC_SUBST(OPENJDK_BUILD_OS_TYPE)
    AC_SUBST(OPENJDK_BUILD_OS_ENV)
    AC_SUBST(OPENJDK_BUILD_CPU)
    AC_SUBST(OPENJDK_BUILD_CPU_ARCH)
    AC_SUBST(OPENJDK_BUILD_CPU_BITS)
    AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN)
+   AC_SUBST(OPENJDK_BUILD_CLIB)
  
    AC_MSG_CHECKING([openjdk-build os-cpu])
    AC_MSG_RESULT([$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU])
  
+   if test "x$OPENJDK_BUILD_OS" = "xlinux"; then
+     AC_MSG_CHECKING([openjdk-build C library])
+     AC_MSG_RESULT([$OPENJDK_BUILD_CLIB])
+   fi
+ 
    # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
    PLATFORM_EXTRACT_VARS_FROM_OS($host_os)
    PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
    # ... and setup our own variables. (Do this explicitly to facilitate searching)
    OPENJDK_TARGET_OS="$VAR_OS"
*** 206,225 ****
--- 225,251 ----
    fi
    OPENJDK_TARGET_CPU="$VAR_CPU"
    OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
    OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
    OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
+   OPENJDK_TARGET_CLIB="$VAR_CLIB"
    AC_SUBST(OPENJDK_TARGET_OS)
    AC_SUBST(OPENJDK_TARGET_OS_TYPE)
    AC_SUBST(OPENJDK_TARGET_OS_ENV)
    AC_SUBST(OPENJDK_TARGET_CPU)
    AC_SUBST(OPENJDK_TARGET_CPU_ARCH)
    AC_SUBST(OPENJDK_TARGET_CPU_BITS)
    AC_SUBST(OPENJDK_TARGET_CPU_ENDIAN)
+   AC_SUBST(OPENJDK_TARGET_CLIB)
  
    AC_MSG_CHECKING([openjdk-target os-cpu])
    AC_MSG_RESULT([$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
+ 
+   if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
+     AC_MSG_CHECKING([openjdk-target C library])
+     AC_MSG_RESULT([$OPENJDK_TARGET_CLIB])
+   fi
  ])
  
  # Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour
  # accordingly. Must be done after setting up build and target system, but before
  # doing anything else with these values.