make/autoconf/basics.m4

rev 52915 : 8221851: Use of THIS_FILE in hotspot invalidates precompiled header on Linux/GCC
Reviewed-by: tbell, ysuenaga, andrew
rev 52923 : 8226346: Build better binary builders
Reviewed-by: andrew

*** 639,648 ****
--- 639,655 ----
    # We get the top-level directory from the supporting wrappers.
    AC_MSG_CHECKING([for top-level directory])
    AC_MSG_RESULT([$TOPDIR])
    AC_SUBST(TOPDIR)
  
+   if test "x$CUSTOM_ROOT" != x; then
+     WORKSPACE_ROOT="${CUSTOM_ROOT}"
+   else
+     WORKSPACE_ROOT="${TOPDIR}"
+   fi
+   AC_SUBST(WORKSPACE_ROOT)
+ 
    # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
    BASIC_FIXUP_PATH(CURDIR)
    BASIC_FIXUP_PATH(TOPDIR)
  
    # Locate the directory of this script.
*** 865,879 ****
        CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${JVM_VARIANTS_WITH_AND}-${DEBUG_LEVEL}"
      else
        AC_MSG_RESULT([in build directory with custom name])
      fi
  
!     if test "x$CUSTOM_ROOT" != x; then
!       OUTPUTDIR="${CUSTOM_ROOT}/build/${CONF_NAME}"
!     else
!       OUTPUTDIR="${TOPDIR}/build/${CONF_NAME}"
!     fi
      $MKDIR -p "$OUTPUTDIR"
      if test ! -d "$OUTPUTDIR"; then
        AC_MSG_ERROR([Could not create build directory $OUTPUTDIR])
      fi
    else
--- 872,882 ----
        CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${JVM_VARIANTS_WITH_AND}-${DEBUG_LEVEL}"
      else
        AC_MSG_RESULT([in build directory with custom name])
      fi
  
!     OUTPUTDIR="${WORKSPACE_ROOT}/build/${CONF_NAME}"
      $MKDIR -p "$OUTPUTDIR"
      if test ! -d "$OUTPUTDIR"; then
        AC_MSG_ERROR([Could not create build directory $OUTPUTDIR])
      fi
    else