Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
- changeset 2215
- 7a73b8b4ac8a
- parent 2208
- feba63b3fa36
- child 2220
- 47fda751abb6
equal
deleted
inserted
replaced
| 2214:fda76d0c4b84 | 2215:7a73b8b4ac8a |
|---|---|
| 321 # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP. | 321 # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP. |
| 322 if test "x$OPENJDK_BUILD_OS" = xsolaris; then | 322 if test "x$OPENJDK_BUILD_OS" = xsolaris; then |
| 323 PATH="/usr/ccs/bin:$PATH" | 323 PATH="/usr/ccs/bin:$PATH" |
| 324 fi | 324 fi |
| 325 | 325 |
| 326 # Finally add TOOLS_DIR at the beginning, to allow --with-tools-dir to | 326 # Finally add TOOLCHAIN_PATH at the beginning, to allow --with-tools-dir to |
| 327 # override all other locations. | 327 # override all other locations. |
| 328 if test "x$TOOLS_DIR" != x; then | 328 if test "x$TOOLCHAIN_PATH" != x; then |
| 329 PATH=$TOOLS_DIR:$PATH | 329 PATH=$TOOLCHAIN_PATH:$PATH |
| 330 fi | 330 fi |
| 331 | |
| 332 # If a devkit is found on the builddeps server, then prepend its path to the | |
| 333 # PATH variable. If there are cross compilers available in the devkit, these | |
| 334 # will be found by AC_PROG_CC et al. | |
| 335 DEVKIT= | |
| 336 BDEPS_CHECK_MODULE(DEVKIT, devkit, xxx, | |
| 337 [ | |
| 338 # Found devkit | |
| 339 PATH="$DEVKIT/bin:$PATH" | |
| 340 SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root" | |
| 341 if test "x$x_includes" = "xNONE"; then | |
| 342 x_includes="$SYS_ROOT/usr/include/X11" | |
| 343 fi | |
| 344 if test "x$x_libraries" = "xNONE"; then | |
| 345 x_libraries="$SYS_ROOT/usr/lib" | |
| 346 fi | |
| 347 ], | |
| 348 []) | |
| 349 ]) | 331 ]) |
| 350 | 332 |
| 351 # Restore path, etc | 333 # Restore path, etc |
| 352 AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION], | 334 AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION], |
| 353 [ | 335 [ |
| 517 # i686-sun-solaris2.10-gcc will cross compile for i686-sun-solaris2.10. | 499 # i686-sun-solaris2.10-gcc will cross compile for i686-sun-solaris2.10. |
| 518 # If we are not cross compiling, then the default compiler name will be | 500 # If we are not cross compiling, then the default compiler name will be |
| 519 # used. | 501 # used. |
| 520 | 502 |
| 521 $1= | 503 $1= |
| 522 # If TOOLS_DIR is set, check for all compiler names in there first | 504 # If TOOLCHAIN_PATH is set, check for all compiler names in there first |
| 523 # before checking the rest of the PATH. | 505 # before checking the rest of the PATH. |
| 524 # FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION | 506 # FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION |
| 525 # step, this should not be necessary. | 507 # step, this should not be necessary. |
| 526 if test -n "$TOOLS_DIR"; then | 508 if test -n "$TOOLCHAIN_PATH"; then |
| 527 PATH_save="$PATH" | 509 PATH_save="$PATH" |
| 528 PATH="$TOOLS_DIR" | 510 PATH="$TOOLCHAIN_PATH" |
| 529 AC_PATH_PROGS(TOOLS_DIR_$1, $3) | 511 AC_PATH_PROGS(TOOLCHAIN_PATH_$1, $SEARCH_LIST) |
| 530 $1=$TOOLS_DIR_$1 | 512 $1=$TOOLCHAIN_PATH_$1 |
| 531 PATH="$PATH_save" | 513 PATH="$PATH_save" |
| 532 fi | 514 fi |
| 533 | 515 |
| 534 # AC_PATH_PROGS can't be run multiple times with the same variable, | 516 # AC_PATH_PROGS can't be run multiple times with the same variable, |
| 535 # so create a new name for this run. | 517 # so create a new name for this run. |
