make/autoconf/basics.m4

@@ -637,10 +637,18 @@
         elif test -d "$DEVKIT_ROOT/$host_alias/libc"; then
           SYSROOT="$DEVKIT_ROOT/$host_alias/libc"
         elif test -d "$DEVKIT_ROOT/$host/sys-root"; then
           SYSROOT="$DEVKIT_ROOT/$host/sys-root"
         fi
+
+        if test "x$DEVKIT_ROOT" != x; then
+          DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib"
+          if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+            DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib64"
+          fi
+          AC_SUBST(DEVKIT_LIB_DIR)
+        fi
       ]
   )
 
   # You can force the sysroot if the sysroot encoded into the compiler tools
   # is not correct.