1.1 --- a/common/autoconf/toolchain.m4 Thu Apr 12 02:54:38 2018 -0700
1.2 +++ b/common/autoconf/toolchain.m4 Mon Apr 16 00:48:00 2018 -0700
1.3 @@ -323,29 +323,11 @@
1.4 PATH="/usr/ccs/bin:$PATH"
1.5 fi
1.6
1.7 - # Finally add TOOLS_DIR at the beginning, to allow --with-tools-dir to
1.8 + # Finally add TOOLCHAIN_PATH at the beginning, to allow --with-tools-dir to
1.9 # override all other locations.
1.10 - if test "x$TOOLS_DIR" != x; then
1.11 - PATH=$TOOLS_DIR:$PATH
1.12 + if test "x$TOOLCHAIN_PATH" != x; then
1.13 + PATH=$TOOLCHAIN_PATH:$PATH
1.14 fi
1.15 -
1.16 - # If a devkit is found on the builddeps server, then prepend its path to the
1.17 - # PATH variable. If there are cross compilers available in the devkit, these
1.18 - # will be found by AC_PROG_CC et al.
1.19 - DEVKIT=
1.20 - BDEPS_CHECK_MODULE(DEVKIT, devkit, xxx,
1.21 - [
1.22 - # Found devkit
1.23 - PATH="$DEVKIT/bin:$PATH"
1.24 - SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
1.25 - if test "x$x_includes" = "xNONE"; then
1.26 - x_includes="$SYS_ROOT/usr/include/X11"
1.27 - fi
1.28 - if test "x$x_libraries" = "xNONE"; then
1.29 - x_libraries="$SYS_ROOT/usr/lib"
1.30 - fi
1.31 - ],
1.32 - [])
1.33 ])
1.34
1.35 # Restore path, etc
1.36 @@ -519,15 +501,15 @@
1.37 # used.
1.38
1.39 $1=
1.40 - # If TOOLS_DIR is set, check for all compiler names in there first
1.41 + # If TOOLCHAIN_PATH is set, check for all compiler names in there first
1.42 # before checking the rest of the PATH.
1.43 # FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION
1.44 # step, this should not be necessary.
1.45 - if test -n "$TOOLS_DIR"; then
1.46 + if test -n "$TOOLCHAIN_PATH"; then
1.47 PATH_save="$PATH"
1.48 - PATH="$TOOLS_DIR"
1.49 - AC_PATH_PROGS(TOOLS_DIR_$1, $3)
1.50 - $1=$TOOLS_DIR_$1
1.51 + PATH="$TOOLCHAIN_PATH"
1.52 + AC_PATH_PROGS(TOOLCHAIN_PATH_$1, $SEARCH_LIST)
1.53 + $1=$TOOLCHAIN_PATH_$1
1.54 PATH="$PATH_save"
1.55 fi
1.56
