481 |
481 |
482 AC_SUBST(VS_PATH) |
482 AC_SUBST(VS_PATH) |
483 AC_SUBST(VS_INCLUDE) |
483 AC_SUBST(VS_INCLUDE) |
484 AC_SUBST(VS_LIB) |
484 AC_SUBST(VS_LIB) |
485 |
485 |
486 # Convert VS_PATH to unix style |
|
487 OLDIFS="$IFS" |
486 OLDIFS="$IFS" |
488 IFS=";" |
487 IFS=";" |
489 VS_PATH_WINDOWS="$VS_PATH" |
488 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
490 VS_PATH="" |
489 # Convert VS_PATH to unix style |
491 for i in $VS_PATH_WINDOWS; do |
490 VS_PATH_WINDOWS="$VS_PATH" |
492 path=$i |
491 VS_PATH="" |
493 # Only process non-empty elements |
492 for i in $VS_PATH_WINDOWS; do |
494 if test "x$path" != x; then |
493 path=$i |
495 IFS="$OLDIFS" |
494 # Only process non-empty elements |
496 # Check that directory exists before calling fixup_path |
495 if test "x$path" != x; then |
497 testpath=$path |
496 IFS="$OLDIFS" |
498 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath]) |
497 # Check that directory exists before calling fixup_path |
499 if test -d "$testpath"; then |
498 testpath=$path |
500 BASIC_FIXUP_PATH([path]) |
499 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath]) |
501 BASIC_APPEND_TO_PATH(VS_PATH, $path) |
500 if test -d "$testpath"; then |
|
501 BASIC_FIXUP_PATH([path]) |
|
502 BASIC_APPEND_TO_PATH(VS_PATH, $path) |
|
503 fi |
|
504 IFS=";" |
502 fi |
505 fi |
503 IFS=";" |
506 done |
504 fi |
507 fi |
505 done |
|
506 # Convert VS_INCLUDE into SYSROOT_CFLAGS |
508 # Convert VS_INCLUDE into SYSROOT_CFLAGS |
507 for i in $VS_INCLUDE; do |
509 for i in $VS_INCLUDE; do |
508 ipath=$i |
510 ipath=$i |
509 # Only process non-empty elements |
511 # Only process non-empty elements |
510 if test "x$ipath" != x; then |
512 if test "x$ipath" != x; then |