On 03/12/13 14:54, Tim Bell wrote:
Please review this change, which provides a fallback to the traditional location for the DXSDK if it is not specified on the configure line. We don't like doing this, but in this case I will give in. It seems many of the legacy build systems we use internally do not have the environment variable defined.

Bug report (not visible externally yet... should be soon):

    http://bugs.sun.com/view_bug.do?bug_id=8009819

JDK-8009819
build-infra: RE jdk8 build forest fails for windows since addition of --with-dxsdk

Webrev:

   http://cr.openjdk.java.net/~tbell/8009819/webrev.00/

For some reason, this webrev did not find any changes. While I debug webrev :-/ ... here is the change. There are also the corresponding mechanical changes to common/autoconf/generated-configure.sh and the closed generated-configure.sh:

% hg diff common/autoconf/toolchain_windows.m4
diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4
--- a/common/autoconf/toolchain_windows.m4
+++ b/common/autoconf/toolchain_windows.m4
@@ -280,6 +280,8 @@ AC_DEFUN([TOOLCHAIN_SETUP_DXSDK],
     dxsdk_path="$with_dxsdk"
   elif test "x$DXSDK_DIR" != x; then
     dxsdk_path="$DXSDK_DIR"
+  elif test -d "C:/DXSDK"; then
+    dxsdk_path="C:/DXSDK"
   else
     AC_MSG_ERROR([Could not find the DirectX SDK])
   fi





This is related to the fix for 8008073, which is still in the build forest.

    http://bugs.sun.com/view_bug.do?bug_id=8008073

Thank you-

Tim



Reply via email to