Skip to content

Commit 0890620

Browse files
magicusvidmik
andcommittedDec 10, 2020
8258005: JDK build fails with incorrect fixpath script
Co-authored-by: Mikael Vidstedt <mikael@openjdk.org> Reviewed-by: erikj
1 parent 502a524 commit 0890620

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎make/autoconf/basic_windows.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
158158
else
159159
WINENV_PREFIX_ARG="$WINENV_PREFIX"
160160
fi
161-
FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT/\\/\\\\} -t $WINENV_TEMP_DIR -c $CMD -q"
161+
FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\} -t $WINENV_TEMP_DIR -c $CMD -q"
162162
FIXPATH_BASE="$BASH $FIXPATH_DIR/fixpath.sh $FIXPATH_ARGS"
163163
FIXPATH="$FIXPATH_BASE exec"
164164
@@ -203,7 +203,7 @@ AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
203203
[
204204
if test "x$OPENJDK_BUILD_OS" = xwindows; then
205205
FIXPATH_CMDLINE=". $TOPDIR/make/scripts/fixpath.sh -e $PATHTOOL \
206-
-p $WINENV_PREFIX_ARG -r ${WINENV_ROOT/\\/\\\\} -t $WINENV_TEMP_DIR \
206+
-p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\} -t $WINENV_TEMP_DIR \
207207
-c $CMD -q"
208208
$ECHO > $OUTPUTDIR/fixpath '#!/bin/bash'
209209
$ECHO >> $OUTPUTDIR/fixpath export PATH='"[$]PATH:'$PATH'"'

0 commit comments

Comments
 (0)
Please sign in to comment.