common/autoconf/toolchain.m4

*** 197,232 ****
    # For solaris we really need solaris tools, and not the GNU equivalent.
    # The build tools on Solaris reside in /usr/ccs (C Compilation System),
    # so add that to path before starting to probe.
    # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP.
    if test "x$OPENJDK_BUILD_OS" = xsolaris; then
      PATH="/usr/ccs/bin:$PATH"
    fi
- 
-   # Finally add TOOLS_DIR at the beginning, to allow --with-tools-dir to 
-   # override all other locations.
-   if test "x$TOOLS_DIR" != x; then
-     PATH=$TOOLS_DIR:$PATH
    fi
  
!   # If a devkit is found on the builddeps server, then prepend its path to the
!   # PATH variable. If there are cross compilers available in the devkit, these
!   # will be found by AC_PROG_CC et al.
!   DEVKIT=
!   BDEPS_CHECK_MODULE(DEVKIT, devkit, xxx,
!       [
!         # Found devkit
!         PATH="$DEVKIT/bin:$PATH"
!         SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
!         if test "x$x_includes" = "xNONE"; then
!           x_includes="$SYS_ROOT/usr/include/X11"
!         fi
!         if test "x$x_libraries" = "xNONE"; then
!           x_libraries="$SYS_ROOT/usr/lib"
          fi
-       ],
-       [])
  ])
  
  # Restore path, etc
  AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
  [
--- 197,216 ----
    # For solaris we really need solaris tools, and not the GNU equivalent.
    # The build tools on Solaris reside in /usr/ccs (C Compilation System),
    # so add that to path before starting to probe.
    # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP.
    if test "x$OPENJDK_BUILD_OS" = xsolaris; then
+     if test "x$TOOLCHAIN_PATH" = x; then
        PATH="/usr/ccs/bin:$PATH"
      fi
    fi
  
!   # Finally add TOOLCHAIN_PATH at the beginning, to allow --with-tools-dir to 
!   # override all other locations.
!   if test "x$TOOLCHAIN_PATH" != x; then
!     PATH=$TOOLCHAIN_PATH:$PATH
    fi
  ])
  
  # Restore path, etc
  AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
  [
*** 394,412 ****
      # i686-sun-solaris2.10-gcc will cross compile for i686-sun-solaris2.10.
      # If we are not cross compiling, then the default compiler name will be 
      # used.
  
      $1=
!     # If TOOLS_DIR is set, check for all compiler names in there first
      # before checking the rest of the PATH.
!     # FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION
!     # step, this should not be necessary.
!     if test -n "$TOOLS_DIR"; then
        PATH_save="$PATH"
!       PATH="$TOOLS_DIR"
!       AC_PATH_PROGS(TOOLS_DIR_$1, $SEARCH_LIST)
!       $1=$TOOLS_DIR_$1
        PATH="$PATH_save"
      fi
  
      # AC_PATH_PROGS can't be run multiple times with the same variable,
      # so create a new name for this run.
--- 378,394 ----
      # i686-sun-solaris2.10-gcc will cross compile for i686-sun-solaris2.10.
      # If we are not cross compiling, then the default compiler name will be 
      # used.
  
      $1=
!     # If TOOLCHAIN_PATH is set, check for all compiler names in there first
      # before checking the rest of the PATH.
!     if test -n "$TOOLCHAIN_PATH"; then
        PATH_save="$PATH"
!       PATH="$TOOLCHAIN_PATH"
!       AC_PATH_PROGS(TOOLCHAIN_PATH_$1, $SEARCH_LIST)
!       $1=$TOOLCHAIN_PATH_$1
        PATH="$PATH_save"
      fi
  
      # AC_PATH_PROGS can't be run multiple times with the same variable,
      # so create a new name for this run.