Skip to content

Commit 764111f

Browse files
Dongbo HeRealFYang
authored andcommitted
8260272: bash configure --prefix does not work after JDK-8257679
Reviewed-by: erikj, ihse
1 parent 4ae39b1 commit 764111f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

make/autoconf/util_paths.m4

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
176176
# space.
177177
[ if [[ "$OPENJDK_BUILD_OS" = "windows" && input =~ ^$FIXPATH ]]; then
178178
line="${input#$FIXPATH }"
179-
prefix="$FIXPATH "
179+
fixpath_prefix="$FIXPATH "
180180
else
181181
line="$input"
182-
prefix=""
182+
fixpath_prefix=""
183183
fi ]
184184
path="${line%% *}"
185185
arguments="${line#"$path"}"
@@ -247,11 +247,11 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
247247
248248
# Now we have a usable command as new_path, with arguments in arguments
249249
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
250-
if test "x$prefix" = x; then
251-
# Only mess around if prefix was not given
250+
if test "x$fixpath_prefix" = x; then
251+
# Only mess around if fixpath_prefix was not given
252252
UTIL_CHECK_WINENV_EXEC_TYPE("$new_path")
253253
if test "x$RESULT" = xwindows; then
254-
prefix="$FIXPATH "
254+
fixpath_prefix="$FIXPATH "
255255
# make sure we have an .exe suffix (but not two)
256256
new_path="${new_path%.exe}.exe"
257257
else
@@ -262,11 +262,11 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
262262
fi
263263
264264
if test "x$3" = xNOFIXPATH; then
265-
prefix=""
265+
fixpath_prefix=""
266266
fi
267267
268268
# Now join together the path and the arguments once again
269-
new_complete="$prefix$new_path$arguments"
269+
new_complete="$fixpath_prefix$new_path$arguments"
270270
$1="$new_complete"
271271
fi
272272
])

0 commit comments

Comments
 (0)