534 # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
535 FIXPATH="$FIXPATH_BIN -c"
536 elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
537 # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
538 # @ was chosen as separator to minimize risk of other tools messing around with it
539 all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" \
540 | tr ' ' '\n' | $GREP '^/./' | $SORT | $UNIQ`
541 fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
542 FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
543 elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.wsl; then
544 FIXPATH="$FIXPATH_BIN -w"
545 fi
546 FIXPATH_SRC_W="$FIXPATH_SRC"
547 FIXPATH_BIN_W="$FIXPATH_BIN"
548 BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W])
549 BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
550 $RM -rf $FIXPATH_BIN $FIXPATH_DIR
551 $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
552 cd $FIXPATH_DIR
553 $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
554 cd $CURDIR
555
556 if test ! -x $FIXPATH_BIN; then
557 AC_MSG_RESULT([no])
558 cat $FIXPATH_DIR/fixpath1.log
559 AC_MSG_ERROR([Could not create $FIXPATH_BIN])
560 fi
561 AC_MSG_RESULT([yes])
562
563 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
564 OLD_WSLENV="$WSLENV"
565 WSLENV=`$ECHO $WSLENV | $SED 's/PATH\/l://'`
566 BASIC_APPEND_TO_PATH(WSLENV, "FIXPATH_PATH")
567 export WSLENV
568 export FIXPATH_PATH=$VS_PATH_WINDOWS
569 AC_MSG_NOTICE([FIXPATH_PATH is $FIXPATH_PATH])
570 AC_MSG_NOTICE([Rewriting WSLENV from $OLD_WSLENV to $WSLENV])
571 fi
572
573 AC_MSG_CHECKING([if fixpath.exe works])
574 cd $FIXPATH_DIR
575 $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
576 > $FIXPATH_DIR/fixpath2.log 2>&1
577 cd $CURDIR
578 if test ! -x $FIXPATH_DIR/fixpath2.exe; then
579 AC_MSG_RESULT([no])
580 cat $FIXPATH_DIR/fixpath2.log
581 AC_MSG_ERROR([fixpath did not work!])
582 fi
583 AC_MSG_RESULT([yes])
584
585 FIXPATH_DETACH_FLAG="--detach"
586 fi
587
588 AC_SUBST(FIXPATH)
589 AC_SUBST(FIXPATH_DETACH_FLAG)
590 ])
|
534 # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
535 FIXPATH="$FIXPATH_BIN -c"
536 elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
537 # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
538 # @ was chosen as separator to minimize risk of other tools messing around with it
539 all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" \
540 | tr ' ' '\n' | $GREP '^/./' | $SORT | $UNIQ`
541 fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
542 FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
543 elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.wsl; then
544 FIXPATH="$FIXPATH_BIN -w"
545 fi
546 FIXPATH_SRC_W="$FIXPATH_SRC"
547 FIXPATH_BIN_W="$FIXPATH_BIN"
548 BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W])
549 BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
550 $RM -rf $FIXPATH_BIN $FIXPATH_DIR
551 $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
552 cd $FIXPATH_DIR
553 $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
554 cd $CONFIGURE_START_DIR
555
556 if test ! -x $FIXPATH_BIN; then
557 AC_MSG_RESULT([no])
558 cat $FIXPATH_DIR/fixpath1.log
559 AC_MSG_ERROR([Could not create $FIXPATH_BIN])
560 fi
561 AC_MSG_RESULT([yes])
562
563 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
564 OLD_WSLENV="$WSLENV"
565 WSLENV=`$ECHO $WSLENV | $SED 's/PATH\/l://'`
566 BASIC_APPEND_TO_PATH(WSLENV, "FIXPATH_PATH")
567 export WSLENV
568 export FIXPATH_PATH=$VS_PATH_WINDOWS
569 AC_MSG_NOTICE([FIXPATH_PATH is $FIXPATH_PATH])
570 AC_MSG_NOTICE([Rewriting WSLENV from $OLD_WSLENV to $WSLENV])
571 fi
572
573 AC_MSG_CHECKING([if fixpath.exe works])
574 cd $FIXPATH_DIR
575 $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
576 > $FIXPATH_DIR/fixpath2.log 2>&1
577 cd $CONFIGURE_START_DIR
578 if test ! -x $FIXPATH_DIR/fixpath2.exe; then
579 AC_MSG_RESULT([no])
580 cat $FIXPATH_DIR/fixpath2.log
581 AC_MSG_ERROR([fixpath did not work!])
582 fi
583 AC_MSG_RESULT([yes])
584
585 FIXPATH_DETACH_FLAG="--detach"
586 fi
587
588 AC_SUBST(FIXPATH)
589 AC_SUBST(FIXPATH_DETACH_FLAG)
590 ])
|