From 87c4b01ea3d94c25d260f0687addf7ecd154279a Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 3 Dec 2025 14:38:53 +0000
Subject: [PATCH] 8372943: Restore --with-tools-dir

Reviewed-by: mikael, tbell, shade
---
 make/autoconf/basic.m4 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index 316bfc5037d..bb6908d9194 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -353,7 +353,12 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
       [set up toolchain on Mac OS using a path to an Xcode installation])])
 
   UTIL_DEPRECATED_ARG_WITH(sys-root)
-  UTIL_DEPRECATED_ARG_WITH(tools-dir)
+
+  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
+      [Point to a nonstandard Visual Studio installation location on Windows by
+      specifying any existing directory 2 or 3 levels below the installation
+      root.])]
+  )
 
   if test "x$with_xcode_path" != x; then
     if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then